1 files changed, 15 insertions, 2 deletions

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