diff --git a/indra/llui/llspinctrl.cpp b/indra/llui/llspinctrl.cpp index 865e7cd1f6..2e887906c0 100644 --- a/indra/llui/llspinctrl.cpp +++ b/indra/llui/llspinctrl.cpp @@ -418,6 +418,23 @@ void LLSpinCtrl::setLabel(const LLStringExplicit& label) updateLabelColor(); } +// Allow setting an argument on the label +BOOL LLSpinCtrl::setLabelArg(const std::string& key, const LLStringExplicit& text) +{ + if (mLabelBox) + { + mLabelBox->setTextArg(key, text); + } + else + { + llwarns << "Attempting to set label argument on LLSpinCtrl constructed without one " << getName() << llendl; + } + updateLabelColor(); + + return TRUE; +} +// Allow setting an argument on the label + void LLSpinCtrl::setAllowEdit(BOOL allow_edit) { mEditor->setEnabled(allow_edit); diff --git a/indra/llui/llspinctrl.h b/indra/llui/llspinctrl.h index 87814f838e..5d88439ab0 100644 --- a/indra/llui/llspinctrl.h +++ b/indra/llui/llspinctrl.h @@ -79,6 +79,8 @@ public: void setLabelColor(const LLColor4& c) { mTextEnabledColor = c; updateLabelColor(); } void setDisabledLabelColor(const LLColor4& c) { mTextDisabledColor = c; updateLabelColor();} void setAllowEdit(BOOL allow_edit); + // Allow setting an argument on the label + virtual BOOL setLabelArg(const std::string& key, const LLStringExplicit& text); virtual void onTabInto(); diff --git a/indra/newview/llfloaterland.cpp b/indra/newview/llfloaterland.cpp index fcc59f291a..568f09dc2b 100644 --- a/indra/newview/llfloaterland.cpp +++ b/indra/newview/llfloaterland.cpp @@ -2444,7 +2444,7 @@ BOOL LLPanelLandAccess::postBuild() } std::string type_currency = LLGridManager::getInstance()->getCurrency(); - getChild("PriceSpin")->setLabelArg(std::string("[CUR]"), type_currency); + getChild("PriceSpin")->setLabelArg("[CUR]", type_currency); return TRUE; }