diff --git a/indra/newview/llfloaterland.cpp b/indra/newview/llfloaterland.cpp index a1a402f28325f77b73d1b70a18d5b1f160704767..69d8117cab8b13c97196180ae3134a6522fac63f 100755 --- a/indra/newview/llfloaterland.cpp +++ b/indra/newview/llfloaterland.cpp @@ -1200,6 +1200,8 @@ void LLPanelLandObjects::onDoubleClickOwner() } } +const LLStringExplicit zero_str("0"); + // public void LLPanelLandObjects::refresh() { @@ -1221,15 +1223,15 @@ void LLPanelLandObjects::refresh() if (!parcel) { - mSWTotalObjects->setTextArg("[COUNT]", llformat("%d", 0)); - mSWTotalObjects->setTextArg("[TOTAL]", llformat("%d", 0)); - mSWTotalObjects->setTextArg("[AVAILABLE]", llformat("%d", 0)); - mObjectContribution->setTextArg("[COUNT]", llformat("%d", 0)); - mTotalObjects->setTextArg("[COUNT]", llformat("%d", 0)); - mOwnerObjects->setTextArg("[COUNT]", llformat("%d", 0)); - mGroupObjects->setTextArg("[COUNT]", llformat("%d", 0)); - mOtherObjects->setTextArg("[COUNT]", llformat("%d", 0)); - mSelectedObjects->setTextArg("[COUNT]", llformat("%d", 0)); + mSWTotalObjects->setTextArg("[COUNT]", zero_str); + mSWTotalObjects->setTextArg("[TOTAL]", zero_str); + mSWTotalObjects->setTextArg("[AVAILABLE]", zero_str); + mObjectContribution->setTextArg("[COUNT]", zero_str); + mTotalObjects->setTextArg("[COUNT]", zero_str); + mOwnerObjects->setTextArg("[COUNT]", zero_str); + mGroupObjects->setTextArg("[COUNT]", zero_str); + mOtherObjects->setTextArg("[COUNT]", zero_str); + mSelectedObjects->setTextArg("[COUNT]", zero_str); } else { @@ -2528,10 +2530,10 @@ void LLPanelLandAccess::refresh() getChild<LLUICtrl>("PassCheck")->setValue(FALSE); getChild<LLUICtrl>("PriceSpin")->setValue((F32)PARCEL_PASS_PRICE_DEFAULT); getChild<LLUICtrl>("HoursSpin")->setValue(PARCEL_PASS_HOURS_DEFAULT ); - getChild<LLUICtrl>("AccessList")->setToolTipArg(LLStringExplicit("[LISTED]"), llformat("%d",0)); - getChild<LLUICtrl>("AccessList")->setToolTipArg(LLStringExplicit("[MAX]"), llformat("%d",0)); - getChild<LLUICtrl>("BannedList")->setToolTipArg(LLStringExplicit("[LISTED]"), llformat("%d",0)); - getChild<LLUICtrl>("BannedList")->setToolTipArg(LLStringExplicit("[MAX]"), llformat("%d",0)); + getChild<LLUICtrl>("AccessList")->setToolTipArg(LLStringExplicit("[LISTED]"), zero_str); + getChild<LLUICtrl>("AccessList")->setToolTipArg(LLStringExplicit("[MAX]"), zero_str); + getChild<LLUICtrl>("BannedList")->setToolTipArg(LLStringExplicit("[LISTED]"), zero_str); + getChild<LLUICtrl>("BannedList")->setToolTipArg(LLStringExplicit("[MAX]"), zero_str); } } diff --git a/indra/newview/llfloaterproperties.cpp b/indra/newview/llfloaterproperties.cpp index 8d55713dd320f0e3d3da59bc9f189d1eda78ddf6..91c24227a9419c47f0ce4633ffa108f23f9d5b86 100755 --- a/indra/newview/llfloaterproperties.cpp +++ b/indra/newview/llfloaterproperties.cpp @@ -534,7 +534,7 @@ void LLFloaterProperties::refreshFromItem(LLInventoryItem* item) } else { - edit_cost->setValue(llformat("%d",0)); + edit_cost->setValue("0"); combo_sale_type->setValue(LLSaleInfo::FS_COPY); } } diff --git a/indra/newview/llsidepaneliteminfo.cpp b/indra/newview/llsidepaneliteminfo.cpp index 4850a1fb786bb3a1357ab7fc11b8c2fbf35eae71..0609fa50f7d30ec5e77592ebe0110222d226023e 100755 --- a/indra/newview/llsidepaneliteminfo.cpp +++ b/indra/newview/llsidepaneliteminfo.cpp @@ -672,7 +672,7 @@ void LLSidepanelItemInfo::refreshFromItem(LLViewerInventoryItem* item) } else { - edit_cost->setValue(llformat("%d",0)); + edit_cost->setValue("0"); combo_sale_type->setValue(LLSaleInfo::FS_COPY); } }