From 439d5b389e5bdda6b61c251c7aa3f9f9d648e9ef Mon Sep 17 00:00:00 2001
From: David Seikel
Date: Tue, 18 Jan 2011 10:40:07 +1000
Subject: Set the Grid Manager to not show by default, but make it configurable
 and toggled by CTRL+SHIFT+G.

By Tom Meta from his fork.  See the TomsOldWork branch.
---
 linden/indra/newview/app_settings/settings.xml | 11 +++++++++++
 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 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
+    <key>ShowGridManager</key>
+    <map>
+      <key>Comment</key>
+      <string>(meta7 setting) Show the grid manager on startup?</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <real>0</real>
+    </map>
     <key>ShowHoverTips</key>
     <map>
       <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 )
 	}
 
 	BOOL show_start = TRUE;
-
+	BOOL show_grid_manager = TRUE;
+ 
 	if ( ! force_visible )
+	{
 		show_start = gSavedSettings.getBOOL("ShowStartLocation");
+	}
+	if (gSavedSettings.getBOOL("ForceShowGrid"))
+	{
+		force_visible = true;
+	}
+	if ( force_visible )
+	{
+		show_grid_manager = gSavedSettings.getBOOL("ShowGridManager");
+	}
 
 // [RLVa:KB] - Alternate: Snowglobe-1.2.4 | Checked: 2009-07-08 (RLVa-1.0.0e)
 	// TODO-RLVa: figure out some way to make this work with RLV_EXTENSION_STARTLOCATION
@@ -756,7 +767,9 @@ void LLPanelLogin::refreshLocation( bool force_visible )
 	BOOL show_server = gSavedSettings.getBOOL("ForceShowGrid");
 	sInstance->childSetVisible("server_combo", show_server);
 #else*/
-	sInstance->childSetVisible("server_combo", TRUE);
+	sInstance->childSetVisible("server_combo", show_grid_manager);
+	sInstance->childSetVisible("grid_btn", show_grid_manager);
+	sInstance->childSetVisible("grid_text", show_grid_manager);
 //#endif
 
 #endif
-- 
cgit v1.1