diff options
| author | Christian Goetze <cg@lindenlab.com> | 2007-10-10 00:01:43 +0000 |
|---|---|---|
| committer | Christian Goetze <cg@lindenlab.com> | 2007-10-10 00:01:43 +0000 |
| commit | 5ec8bbbe2244ea70d8aa74b5c572351632699425 (patch) | |
| tree | 12a4e92720c531105a21ef4f9f363b8572d72a3a /indra/newview/llcurrencyuimanager.cpp | |
| parent | b3b62c3b9ef32c4dbcae51cd3ef582734d5717bb (diff) | |
svn merge -r71238:71367 svn+ssh://svn/svn/linden/branches/maint-ui-qa3
Diffstat (limited to 'indra/newview/llcurrencyuimanager.cpp')
| -rw-r--r-- | indra/newview/llcurrencyuimanager.cpp | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/indra/newview/llcurrencyuimanager.cpp b/indra/newview/llcurrencyuimanager.cpp index 6f649acb29..1e97df0b8b 100644 --- a/indra/newview/llcurrencyuimanager.cpp +++ b/indra/newview/llcurrencyuimanager.cpp @@ -380,7 +380,7 @@ void LLCurrencyUIManager::Impl::updateUI() { if (!mZeroMessage.empty() && mUserCurrencyBuy == 0) { - lindenAmount->setText(""); + lindenAmount->setText(LLString::null); } else { @@ -459,20 +459,20 @@ bool LLCurrencyUIManager::process() return changed; } -void LLCurrencyUIManager::buy() +void LLCurrencyUIManager::buy(const LLString& buy_msg) { if (!canBuy()) { return; } - // XUI:translate + LLUIString msg = buy_msg; + msg.setArg("[LINDENS]", llformat("%d", impl.mUserCurrencyBuy)); + msg.setArg("[USD]", llformat("%#.2f", impl.mSiteCurrencyEstimatedCost / 100.0)); LLConfirmationManager::confirm(impl.mSiteConfirm, - llformat("Buy L$ %d for approx. US$ %#.2f\n", - impl.mUserCurrencyBuy, - impl.mSiteCurrencyEstimatedCost / 100.0), - impl, - &LLCurrencyUIManager::Impl::startCurrencyBuy); + msg, + impl, + &LLCurrencyUIManager::Impl::startCurrencyBuy); } @@ -518,3 +518,4 @@ std::string LLCurrencyUIManager::errorURI() return impl.mErrorURI; } + |