aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMcCabe Maxsted2011-04-11 19:37:59 -0700
committerMcCabe Maxsted2011-04-11 19:37:59 -0700
commit7f7af932b42c69d00b725738c9fad0187a023cb0 (patch)
treedad7005ed38128303bcc432d328ae45d4fb5376a
parentFixed string truncated in prefs > network (#841) (diff)
downloadmeta-impy-7f7af932b42c69d00b725738c9fad0187a023cb0.zip
meta-impy-7f7af932b42c69d00b725738c9fad0187a023cb0.tar.gz
meta-impy-7f7af932b42c69d00b725738c9fad0187a023cb0.tar.bz2
meta-impy-7f7af932b42c69d00b725738c9fad0187a023cb0.tar.xz
Fixed #599: 'Account History'/'Manage My Account' use SL-specific URLs (since we don't get these from any grids, disable 'em for now)
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/llstartup.cpp3
-rw-r--r--linden/indra/newview/llviewermenu.cpp18
-rw-r--r--linden/indra/newview/llviewermenu.h2
3 files changed, 22 insertions, 1 deletions
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()
2846 LL_DEBUGS("AppInitStartupState") << "STATE_CLEANUP" << LL_ENDL; 2846 LL_DEBUGS("AppInitStartupState") << "STATE_CLEANUP" << LL_ENDL;
2847 set_startup_status(1.0, "", ""); 2847 set_startup_status(1.0, "", "");
2848 2848
2849 // Make sure we do this right after the login screen -- MC
2850 update_grid_specific_menus();
2851
2849 // Make sure all the branding is in order -- MC 2852 // Make sure all the branding is in order -- MC
2850 if (gStatusBar) 2853 if (gStatusBar)
2851 { 2854 {
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()
725 gLoginMenuBarView->setBackgroundColor( color ); 725 gLoginMenuBarView->setBackgroundColor( color );
726 726
727 gMenuHolder->addChild(gLoginMenuBarView); 727 gMenuHolder->addChild(gLoginMenuBarView);
728
729} 728}
730 729
731 730
731void update_grid_specific_menus()
732{
733 if (!gMenuHolder || !gMenuBarView)
734 {
735 return;
736 }
737 else
738 {
739 // Disable these when we're not on Second Life grids
740 // (or don't have URLS for them if non-SL grids start using 'em) -- MC
741 gMenuHolder->childSetEnabled("Manage My Account...", gHippoGridManager->getConnectedGrid()->isSecondLife());
742 gMenuHolder->childSetVisible("Manage My Account...", gHippoGridManager->getConnectedGrid()->isSecondLife());
743 gMenuHolder->childSetEnabled("Account History...", gHippoGridManager->getConnectedGrid()->isSecondLife());
744 gMenuHolder->childSetVisible("Account History...", gHippoGridManager->getConnectedGrid()->isSecondLife());
745 }
746}
747
732 748
733void init_client_menu(LLMenuGL* menu) 749void init_client_menu(LLMenuGL* menu)
734{ 750{
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;
47void pre_init_menus(); 47void pre_init_menus();
48void init_menus(); 48void init_menus();
49void cleanup_menus(); 49void cleanup_menus();
50// Updates grid-specific menu options after login
51void update_grid_specific_menus();
50 52
51void show_debug_menus(); // checks for if menus should be shown first. 53void show_debug_menus(); // checks for if menus should be shown first.
52// builds either current or legacy pie menus depending upon LegacyPieEnabled 54// builds either current or legacy pie menus depending upon LegacyPieEnabled