Fixed #599: 'Account History'/'Manage My Account' use SL-specific URLs (since we don't get these from any grids, disable 'em for now)

1 files changed, 17 insertions, 1 deletions

diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp
index a22f704..b641ce9 100644
--- a/linden/indra/newview/llviewermenu.cpp
+++ b/linden/indra/newview/llviewermenu.cpp
@@ -725,10 +725,26 @@ void init_menus()
         gLoginMenuBarView->setBackgroundColor( color );
 
         gMenuHolder->addChild(gLoginMenuBarView);
-        
 }
 
 
+void update_grid_specific_menus()
+{
+        if (!gMenuHolder || !gMenuBarView)
+        {
+                return;
+        }
+        else
+        {
+                // Disable these when we're not on Second Life grids 
+                // (or don't have URLS for them if non-SL grids start using 'em) -- MC
+                gMenuHolder->childSetEnabled("Manage My Account...", gHippoGridManager->getConnectedGrid()->isSecondLife());
+                gMenuHolder->childSetVisible("Manage My Account...", gHippoGridManager->getConnectedGrid()->isSecondLife());
+                gMenuHolder->childSetEnabled("Account History...", gHippoGridManager->getConnectedGrid()->isSecondLife());
+                gMenuHolder->childSetVisible("Account History...", gHippoGridManager->getConnectedGrid()->isSecondLife());
+        }
+}
+
 
 void init_client_menu(LLMenuGL* menu)
 {