diff -r 8b455c1b7a5e doc/contributions.txt --- a/doc/contributions.txt Tue Oct 25 14:44:23 2011 -0400 +++ b/doc/contributions.txt Fri Oct 28 07:23:47 2011 -0400 @@ -581,6 +581,7 @@ STORM-1639 STORM-910 STORM-1642 + STORM-1105 Kadah Coba STORM-1060 Jondan Lundquist diff -r 8b455c1b7a5e indra/newview/llfloaterland.cpp --- a/indra/newview/llfloaterland.cpp Tue Oct 25 14:44:23 2011 -0400 +++ b/indra/newview/llfloaterland.cpp Fri Oct 28 07:23:47 2011 -0400 @@ -433,7 +433,6 @@ mTextDwell = getChild("DwellText"); - mBtnBuyLand = getChild("Buy Land..."); mBtnBuyLand->setClickedCallback(onClickBuyLand, (void*)&BUY_PERSONAL_LAND); @@ -696,20 +695,26 @@ S32 area; S32 claim_price; S32 rent_price; - F32 dwell; + F32 dwell = DWELL_NAN; LLViewerParcelMgr::getInstance()->getDisplayInfo(&area, &claim_price, &rent_price, &for_sale, &dwell); - // Area LLUIString price = getString("area_size_text"); price.setArg("[AREA]", llformat("%d",area)); mTextPriceLabel->setText(getString("area_text")); mTextPrice->setText(price.getString()); - mTextDwell->setText(llformat("%.0f", dwell)); + if (dwell == DWELL_NAN) + { + mTextDwell->setText(LLTrans::getString("LoadingData")); + } + else + { + mTextDwell->setText(llformat("%.0f", dwell)); + } if (for_sale) { diff -r 8b455c1b7a5e indra/newview/llviewerparcelmgr.h --- a/indra/newview/llviewerparcelmgr.h Tue Oct 25 14:44:23 2011 -0400 +++ b/indra/newview/llviewerparcelmgr.h Fri Oct 28 07:23:47 2011 -0400 @@ -43,6 +43,8 @@ class LLViewerTexture; class LLViewerRegion; +const F32 DWELL_NAN = -1.0f; // A dwell having this value will be displayed as Loading... + // Constants for sendLandOwner //const U32 NO_NEIGHBOR_JOIN = 0x0; //const U32 ALL_NEIGHBOR_JOIN = U32( NORTH_MASK diff -r 8b455c1b7a5e indra/newview/llviewerparcelmgr.cpp --- a/indra/newview/llviewerparcelmgr.cpp Tue Oct 25 14:44:23 2011 -0400 +++ b/indra/newview/llviewerparcelmgr.cpp Fri Oct 28 07:23:47 2011 -0400 @@ -113,7 +113,7 @@ mRequestResult(0), mWestSouth(), mEastNorth(), - mSelectedDwell(0.f), + mSelectedDwell(DWELL_NAN), mAgentParcelSequenceID(-1), mHoverRequestResult(0), mHoverWestSouth(), @@ -233,7 +233,7 @@ S32 price = 0; S32 rent = 0; BOOL for_sale = FALSE; - F32 dwell = 0.f; + F32 dwell = DWELL_NAN; if (mSelected) { @@ -579,7 +579,7 @@ mCurrentParcel->mBanList.clear(); //mCurrentParcel->mRenterList.reset(); - mSelectedDwell = 0.f; + mSelectedDwell = DWELL_NAN; // invalidate parcel selection so that existing users of this selection can clean up mCurrentParcelSelection->setParcel(NULL); @@ -1663,7 +1663,7 @@ LLViewerParcelMgr::getInstance()->requestParcelMediaURLFilter(); // Request dwell for this land, if it's not public land. - LLViewerParcelMgr::getInstance()->mSelectedDwell = 0.f; + LLViewerParcelMgr::getInstance()->mSelectedDwell = DWELL_NAN; if (0 != local_id) { LLViewerParcelMgr::getInstance()->sendParcelDwellRequest(); diff -r 8b455c1b7a5e indra/newview/skins/default/xui/en/floater_about_land.xml --- a/indra/newview/skins/default/xui/en/floater_about_land.xml Tue Oct 25 14:44:23 2011 -0400 +++ b/indra/newview/skins/default/xui/en/floater_about_land.xml Fri Oct 28 07:23:47 2011 -0400 @@ -487,7 +487,7 @@ name="DwellText" top_delta="0" width="186"> - 0 + Loading...