diff options
| author | Dave Houlton <euclid@lindenlab.com> | 2021-06-24 14:11:45 -0600 |
|---|---|---|
| committer | Dave Houlton <euclid@lindenlab.com> | 2021-06-24 14:11:45 -0600 |
| commit | 9127fe2978f9b29a96034b5a55ac33b873e22159 (patch) | |
| tree | 442eb88e9bb9a3bdf7db457273f0e27ba6c86a46 /indra/newview/llcurrencyuimanager.cpp | |
| parent | b854eceee3a867d64b20de18d6b7ce91b33abed0 (diff) | |
| parent | 467d8339c970c253dada2cf0e1eed45be66593ac (diff) | |
Merge branch 'master' v 6.4.21 into DRTVWR-528
Diffstat (limited to 'indra/newview/llcurrencyuimanager.cpp')
| -rw-r--r-- | indra/newview/llcurrencyuimanager.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/indra/newview/llcurrencyuimanager.cpp b/indra/newview/llcurrencyuimanager.cpp index d4fc1fe64d..232e461fd0 100644 --- a/indra/newview/llcurrencyuimanager.cpp +++ b/indra/newview/llcurrencyuimanager.cpp @@ -454,7 +454,7 @@ void LLCurrencyUIManager::Impl::updateUI() if (!mUserEnteredCurrencyBuy) { - if (!mZeroMessage.empty() && mUserCurrencyBuy == 0) + if (mUserCurrencyBuy == 0) { lindenAmount->setText(LLStringUtil::null); } @@ -467,8 +467,9 @@ void LLCurrencyUIManager::Impl::updateUI() } } - mPanel.getChild<LLUICtrl>("currency_est")->setTextArg("[LOCALAMOUNT]", getLocalEstimate()); - mPanel.getChildView("currency_est")->setVisible( hasEstimate() && mUserCurrencyBuy > 0); + 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.getChildView("currency_links")->setVisible( mSupportsInternationalBilling); mPanel.getChildView("exchange_rate_note")->setVisible( mSupportsInternationalBilling); |