diff options
author | Roxie Linden <roxie@lindenlab.com> | 2010-03-22 16:12:41 -0700 |
---|---|---|
committer | Roxie Linden <roxie@lindenlab.com> | 2010-03-22 16:12:41 -0700 |
commit | 18b7ab0018695e261dbc5058d76f9d371958b034 (patch) | |
tree | 9b4baa5a5ca563ace1b06ac6b3df9fd9c0a0d0f7 /indra/newview/llfloaterbuycurrency.cpp | |
parent | 60c4621500e478d66a8bdc3a1c80573be2860fee (diff) | |
parent | be139dfb957e1b0d3c59110284c43630d3b57d23 (diff) |
Weekly automated merge from viewer 2.0
Diffstat (limited to 'indra/newview/llfloaterbuycurrency.cpp')
-rw-r--r-- | indra/newview/llfloaterbuycurrency.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llfloaterbuycurrency.cpp b/indra/newview/llfloaterbuycurrency.cpp index 1642e6725e..7fddd1fc5f 100644 --- a/indra/newview/llfloaterbuycurrency.cpp +++ b/indra/newview/llfloaterbuycurrency.cpp @@ -234,8 +234,7 @@ void LLFloaterBuyCurrencyUI::updateUI() if (mHasTarget) { childSetVisible("buy_action", true); - childSetTextArg("buy_action", "[NAME]", mTargetName); - childSetTextArg("buy_action", "[PRICE]", llformat("%d",mTargetPrice)); + childSetTextArg("buy_action", "[ACTION]", mTargetName); } } |