diff options
author | Jacek Antonelli | 2010-05-03 02:13:30 -0500 |
---|---|---|
committer | Jacek Antonelli | 2010-05-03 02:13:30 -0500 |
commit | ad4080854e037c8f89de2b807c287e09cac77194 (patch) | |
tree | 3e89f1903a827d97f73d99d872ea39264c8d881c /linden/indra/newview/llstatusbar.cpp | |
parent | Updated version to 1.3.0 beta 3. (diff) | |
download | meta-impy-ad4080854e037c8f89de2b807c287e09cac77194.zip meta-impy-ad4080854e037c8f89de2b807c287e09cac77194.tar.gz meta-impy-ad4080854e037c8f89de2b807c287e09cac77194.tar.bz2 meta-impy-ad4080854e037c8f89de2b807c287e09cac77194.tar.xz |
Clicking the money balance now does nothing on non-SL grids.
So, it's totally inactive, not just the button hidden.
TODO: Eventually it should actually check whether the grid
supports buying currency.
Diffstat (limited to 'linden/indra/newview/llstatusbar.cpp')
-rw-r--r-- | linden/indra/newview/llstatusbar.cpp | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/linden/indra/newview/llstatusbar.cpp b/linden/indra/newview/llstatusbar.cpp index 6a9e0fc..bdc04d6 100644 --- a/linden/indra/newview/llstatusbar.cpp +++ b/linden/indra/newview/llstatusbar.cpp | |||
@@ -161,7 +161,6 @@ mSquareMetersCommitted(0) | |||
161 | childSetAction("health", onClickHealth, this); | 161 | childSetAction("health", onClickHealth, this); |
162 | childSetAction("no_fly", onClickFly, this); | 162 | childSetAction("no_fly", onClickFly, this); |
163 | childSetAction("buyland", onClickBuyLand, this ); | 163 | childSetAction("buyland", onClickBuyLand, this ); |
164 | childSetAction("buycurrency", onClickBuyCurrency, this ); | ||
165 | childSetAction("no_build", onClickBuild, this ); | 164 | childSetAction("no_build", onClickBuild, this ); |
166 | childSetAction("no_scripts", onClickScripts, this ); | 165 | childSetAction("no_scripts", onClickScripts, this ); |
167 | childSetAction("restrictpush", onClickPush, this ); | 166 | childSetAction("restrictpush", onClickPush, this ); |
@@ -173,11 +172,23 @@ mSquareMetersCommitted(0) | |||
173 | childSetVisible("search_editor", gSavedSettings.getBOOL("ShowSearchBar")); | 172 | childSetVisible("search_editor", gSavedSettings.getBOOL("ShowSearchBar")); |
174 | childSetVisible("search_btn", gSavedSettings.getBOOL("ShowSearchBar")); | 173 | childSetVisible("search_btn", gSavedSettings.getBOOL("ShowSearchBar")); |
175 | childSetVisible("menubar_search_bevel_bg", gSavedSettings.getBOOL("ShowSearchBar")); | 174 | childSetVisible("menubar_search_bevel_bg", gSavedSettings.getBOOL("ShowSearchBar")); |
176 | // Hide the buy currency button in non-Second Life grids -- MC | ||
177 | childSetVisible("buycurrency", gHippoGridManager->getConnectedGrid()->isSecondLife()); | ||
178 | 175 | ||
179 | childSetActionTextbox("ParcelNameText", onClickParcelInfo ); | 176 | childSetActionTextbox("ParcelNameText", onClickParcelInfo ); |
180 | childSetActionTextbox("BalanceText", onClickBalance ); | 177 | |
178 | // Disable buying currency when connected to non-SL grids. | ||
179 | // TODO: Check whether the grid supports buying currency. | ||
180 | if( gHippoGridManager->getConnectedGrid()->isSecondLife() ) | ||
181 | { | ||
182 | childSetEnabled("buycurrency", true); | ||
183 | childSetVisible("buycurrency", true); | ||
184 | childSetAction("buycurrency", onClickBuyCurrency, this ); | ||
185 | childSetActionTextbox("BalanceText", onClickBalance ); | ||
186 | } | ||
187 | else | ||
188 | { | ||
189 | childSetEnabled("buycurrency", false); | ||
190 | childSetVisible("buycurrency", false); | ||
191 | } | ||
181 | 192 | ||
182 | // Adding Net Stat Graph | 193 | // Adding Net Stat Graph |
183 | S32 x = getRect().getWidth() - 2; | 194 | S32 x = getRect().getWidth() - 2; |