From fc7b5186944412d3f2125923aebf921730a79d20 Mon Sep 17 00:00:00 2001 From: Mnikolenko Productengine Date: Wed, 23 Sep 2020 12:28:34 +0300 Subject: Revert "SL-13814 Clarify dialog for insufficient L$ balance" This reverts commit f150600ffb17232bfa88a6225aab437460fc9520. --- indra/newview/llcurrencyuimanager.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'indra/newview/llcurrencyuimanager.cpp') 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("currency_est")->setTextArg("[LOCALAMOUNT]", estimated); - mPanel.getChildView("currency_est")->setVisible( hasEstimate() || mUserCurrencyBuy == 0); + mPanel.getChild("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); -- cgit v1.2.3