diff options
Diffstat (limited to 'linden/indra/newview')
-rw-r--r-- | linden/indra/newview/app_settings/settings.xml | 11 | ||||
-rw-r--r-- | linden/indra/newview/llpanellogin.cpp | 17 |
2 files changed, 26 insertions, 2 deletions
diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml index c946f40..9d5efbf 100644 --- a/linden/indra/newview/app_settings/settings.xml +++ b/linden/indra/newview/app_settings/settings.xml | |||
@@ -10562,6 +10562,17 @@ | |||
10562 | <key>Value</key> | 10562 | <key>Value</key> |
10563 | <integer>0</integer> | 10563 | <integer>0</integer> |
10564 | </map> | 10564 | </map> |
10565 | <key>ShowGridManager</key> | ||
10566 | <map> | ||
10567 | <key>Comment</key> | ||
10568 | <string>(meta7 setting) Show the grid manager on startup?</string> | ||
10569 | <key>Persist</key> | ||
10570 | <integer>1</integer> | ||
10571 | <key>Type</key> | ||
10572 | <string>Boolean</string> | ||
10573 | <key>Value</key> | ||
10574 | <real>0</real> | ||
10575 | </map> | ||
10565 | <key>ShowHoverTips</key> | 10576 | <key>ShowHoverTips</key> |
10566 | <map> | 10577 | <map> |
10567 | <key>Comment</key> | 10578 | <key>Comment</key> |
diff --git a/linden/indra/newview/llpanellogin.cpp b/linden/indra/newview/llpanellogin.cpp index 6464f0b..db086bf 100644 --- a/linden/indra/newview/llpanellogin.cpp +++ b/linden/indra/newview/llpanellogin.cpp | |||
@@ -735,9 +735,20 @@ void LLPanelLogin::refreshLocation( bool force_visible ) | |||
735 | } | 735 | } |
736 | 736 | ||
737 | BOOL show_start = TRUE; | 737 | BOOL show_start = TRUE; |
738 | 738 | BOOL show_grid_manager = TRUE; | |
739 | |||
739 | if ( ! force_visible ) | 740 | if ( ! force_visible ) |
741 | { | ||
740 | show_start = gSavedSettings.getBOOL("ShowStartLocation"); | 742 | show_start = gSavedSettings.getBOOL("ShowStartLocation"); |
743 | } | ||
744 | if (gSavedSettings.getBOOL("ForceShowGrid")) | ||
745 | { | ||
746 | force_visible = true; | ||
747 | } | ||
748 | if ( force_visible ) | ||
749 | { | ||
750 | show_grid_manager = gSavedSettings.getBOOL("ShowGridManager"); | ||
751 | } | ||
741 | 752 | ||
742 | // [RLVa:KB] - Alternate: Snowglobe-1.2.4 | Checked: 2009-07-08 (RLVa-1.0.0e) | 753 | // [RLVa:KB] - Alternate: Snowglobe-1.2.4 | Checked: 2009-07-08 (RLVa-1.0.0e) |
743 | // TODO-RLVa: figure out some way to make this work with RLV_EXTENSION_STARTLOCATION | 754 | // TODO-RLVa: figure out some way to make this work with RLV_EXTENSION_STARTLOCATION |
@@ -756,7 +767,9 @@ void LLPanelLogin::refreshLocation( bool force_visible ) | |||
756 | BOOL show_server = gSavedSettings.getBOOL("ForceShowGrid"); | 767 | BOOL show_server = gSavedSettings.getBOOL("ForceShowGrid"); |
757 | sInstance->childSetVisible("server_combo", show_server); | 768 | sInstance->childSetVisible("server_combo", show_server); |
758 | #else*/ | 769 | #else*/ |
759 | sInstance->childSetVisible("server_combo", TRUE); | 770 | sInstance->childSetVisible("server_combo", show_grid_manager); |
771 | sInstance->childSetVisible("grid_btn", show_grid_manager); | ||
772 | sInstance->childSetVisible("grid_text", show_grid_manager); | ||
760 | //#endif | 773 | //#endif |
761 | 774 | ||
762 | #endif | 775 | #endif |