From 7f7af932b42c69d00b725738c9fad0187a023cb0 Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Mon, 11 Apr 2011 19:37:59 -0700 Subject: Fixed #599: 'Account History'/'Manage My Account' use SL-specific URLs (since we don't get these from any grids, disable 'em for now) --- linden/indra/newview/llstartup.cpp | 3 +++ linden/indra/newview/llviewermenu.cpp | 18 +++++++++++++++++- linden/indra/newview/llviewermenu.h | 2 ++ 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/linden/indra/newview/llstartup.cpp b/linden/indra/newview/llstartup.cpp index ec45955..8e11d8c 100644 --- a/linden/indra/newview/llstartup.cpp +++ b/linden/indra/newview/llstartup.cpp @@ -2846,6 +2846,9 @@ bool idle_startup() LL_DEBUGS("AppInitStartupState") << "STATE_CLEANUP" << LL_ENDL; set_startup_status(1.0, "", ""); + // Make sure we do this right after the login screen -- MC + update_grid_specific_menus(); + // Make sure all the branding is in order -- MC if (gStatusBar) { 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) { diff --git a/linden/indra/newview/llviewermenu.h b/linden/indra/newview/llviewermenu.h index f33c201..9c01598 100644 --- a/linden/indra/newview/llviewermenu.h +++ b/linden/indra/newview/llviewermenu.h @@ -47,6 +47,8 @@ class LLObjectSelection; void pre_init_menus(); void init_menus(); void cleanup_menus(); +// Updates grid-specific menu options after login +void update_grid_specific_menus(); void show_debug_menus(); // checks for if menus should be shown first. // builds either current or legacy pie menus depending upon LegacyPieEnabled -- cgit v1.1