summaryrefslogtreecommitdiff
path: root/indra/newview/llcurrencyuimanager.cpp
diff options
context:
space:
mode:
authorMnikolenko Productengine <mnikolenko@productengine.com>2020-09-23 12:28:34 +0300
committerMnikolenko Productengine <mnikolenko@productengine.com>2020-09-23 12:28:34 +0300
commitfc7b5186944412d3f2125923aebf921730a79d20 (patch)
treeb7612208741f8f16f3c36b0c7ca9af00016f6ffe /indra/newview/llcurrencyuimanager.cpp
parentf51c6608e1eb6cc5c05e97a558f48bc9fc6ea746 (diff)
Revert "SL-13814 Clarify dialog for insufficient L$ balance"
This reverts commit f150600ffb17232bfa88a6225aab437460fc9520.
Diffstat (limited to 'indra/newview/llcurrencyuimanager.cpp')
-rw-r--r--indra/newview/llcurrencyuimanager.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/indra/newview/llcurrencyuimanager.cpp b/indra/newview/llcurrencyuimanager.cpp
index cd7332c4d4..df94e337da 100644
--- a/indra/newview/llcurrencyuimanager.cpp
+++ b/indra/newview/llcurrencyuimanager.cpp
@@ -454,7 +454,7 @@ void LLCurrencyUIManager::Impl::updateUI()
if (!mUserEnteredCurrencyBuy)
{
- if (mUserCurrencyBuy == 0)
+ if (!mZeroMessage.empty() && mUserCurrencyBuy == 0)
{
lindenAmount->setText(LLStringUtil::null);
}
@@ -467,9 +467,8 @@ void LLCurrencyUIManager::Impl::updateUI()
}
}
- std::string estimated = (mUserCurrencyBuy == 0) ? mPanel.getString("estimated_zero") : getLocalEstimate();
- mPanel.getChild<LLUICtrl>("currency_est")->setTextArg("[LOCALAMOUNT]", estimated);
- mPanel.getChildView("currency_est")->setVisible( hasEstimate() || mUserCurrencyBuy == 0);
+ mPanel.getChild<LLUICtrl>("currency_est")->setTextArg("[LOCALAMOUNT]", getLocalEstimate());
+ mPanel.getChildView("currency_est")->setVisible( hasEstimate() && mUserCurrencyBuy > 0);
mPanel.getChildView("currency_links")->setVisible( mSupportsInternationalBilling);
mPanel.getChildView("exchange_rate_note")->setVisible( mSupportsInternationalBilling);