Fixed #339: status bar doesn't update buy currency button branding after switching grids

3 files changed, 18 insertions, 1 deletions

diff --git a/linden/indra/newview/llstartup.cpp b/linden/indra/newview/llstartup.cpp
index dc32b9d..1cc1871 100644
--- a/linden/indra/newview/llstartup.cpp
+++ b/linden/indra/newview/llstartup.cpp
@@ -2665,6 +2665,12 @@ bool idle_startup()
                 LL_DEBUGS("AppInitStartupState") << "STATE_CLEANUP" << LL_ENDL;
                 set_startup_status(1.0, "", "");
 
+                // Make sure all the branding is in order -- MC
+                if (gStatusBar)
+                {
+                        gStatusBar->updateElements();
+                }
+
                 LLFirstUse::ClientTags();
 
                 // Let the map know about the inventory.
diff --git a/linden/indra/newview/llstatusbar.cpp b/linden/indra/newview/llstatusbar.cpp
index 4b90007..3bd30cc 100644
--- a/linden/indra/newview/llstatusbar.cpp
+++ b/linden/indra/newview/llstatusbar.cpp
@@ -662,6 +662,14 @@ void LLStatusBar::refresh()
         mTextParcelName->setRect(r);
 }
 
+void LLStatusBar::updateElements()
+{
+        // TODO: Disable buying currency when connected to non-SL grids
+        // that don't support currency yet -- MC
+        LLButton* buybtn = getChild<LLButton>("buycurrency");
+        buybtn->setLabelArg("[CURRENCY]", gHippoGridManager->getConnectedGrid()->getCurrencySymbol());
+}
+
 void LLStatusBar::setVisibleForMouselook(bool visible)
 {
         mTextBalance->setVisible(visible);
diff --git a/linden/indra/newview/llstatusbar.h b/linden/indra/newview/llstatusbar.h
index c5b4be0..8e71f75 100644
--- a/linden/indra/newview/llstatusbar.h
+++ b/linden/indra/newview/llstatusbar.h
@@ -105,8 +105,11 @@ public:
         void setLandCommitted(S32 committed);
 
         void            refresh();
+        // some elements should hide in mouselook
         void setVisibleForMouselook(bool visible);
-                // some elements should hide in mouselook
+
+        // Update elements that might have changed after login screen
+        void updateElements();
 
         // ACCESSORS
         S32                     getBalance() const;