Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Let's be real about currency

Browse Source 
Fixes grid response for real currency not being heeded in buy currency.
This commit is contained in:
Lirusaito
2019-03-17 14:29:45 -04:00
parent da8692f6a3
commit 1c13ace366
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
indra/newview/llcurrencyuimanager.cpp
View File

@@ -387,6 +387,7 @@ void LLCurrencyUIManager::Impl::updateUI()
} }
mPanel.childSetTextArg("currency_est", "[USD]", llformat("%#.2f", mSiteCurrencyEstimatedCost / 100.0)); mPanel.childSetTextArg("currency_est", "[USD]", llformat("%#.2f", mSiteCurrencyEstimatedCost / 100.0));
mPanel.childSetTextArg("currency_est", "[REALCURRENCY]", gHippoGridManager->getConnectedGrid()->getRealCurrencySymbol());
mPanel.childSetVisible("currency_est", mSiteCurrencyEstimated && mUserCurrencyBuy > 0); mPanel.childSetVisible("currency_est", mSiteCurrencyEstimated && mUserCurrencyBuy > 0);
if (mPanel.childIsEnabled("buy_btn") if (mPanel.childIsEnabled("buy_btn")

4
indra/newview/skins/default/xui/en-us/floater_buy_currency.xml
View File

@@ -46,7 +46,7 @@
</line_editor> </line_editor>
<text bottom_delta="0" follows="top|right" height="16" left_delta="85" <text bottom_delta="0" follows="top|right" height="16" left_delta="85"
name="currency_est" width="180"> name="currency_est" width="180">
for approx. US$ [USD] for approx. [REALCURRENCY] [USD]
</text> </text>
<text bottom_delta="0" follows="top|right" height="16" left_delta="5" <text bottom_delta="0" follows="top|right" height="16" left_delta="5"
name="getting_data" width="180"> name="getting_data" width="180">
@@ -91,6 +91,6 @@ Increase the amount to buy.
<button bottom_delta="0" follows="bottom|left" height="20" label="Purchase" <button bottom_delta="0" follows="bottom|left" height="20" label="Purchase"
left_delta="-96" name="buy_btn" width="90" /> left_delta="-96" name="buy_btn" width="90" />
<string name="buy_currency"> <string name="buy_currency">
Buy [CURRENCY] [LINDENS] for approx. US$ [USD] Buy [CURRENCY] [LINDENS] for approx. [REALCURRENCY] [USD]
</string> </string>
</floater> </floater>