From f93b9d70bdf46df3a87976800c4d29af96370415 Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Tue, 10 Jan 2017 15:09:02 +0200
Subject: MAINT-1384 FIXED Grid selection menu at login not working
 Ctrl-Shift-g

---
 indra/newview/llviewercontrol.cpp                 |  2 +-
 indra/newview/skins/default/xui/en/menu_login.xml | 24 +++++++++++------------
 2 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llviewercontrol.cpp b/indra/newview/llviewercontrol.cpp
index db71849659..7c1921b143 100644
--- a/indra/newview/llviewercontrol.cpp
+++ b/indra/newview/llviewercontrol.cpp
@@ -507,7 +507,7 @@ bool handleVelocityInterpolate(const LLSD& newvalue)
 
 bool handleForceShowGrid(const LLSD& newvalue)
 {
-	LLPanelLogin::updateServer( );
+	LLPanelLogin::updateLocationSelectorsVisibility();
 	return true;
 }
 
diff --git a/indra/newview/skins/default/xui/en/menu_login.xml b/indra/newview/skins/default/xui/en/menu_login.xml
index a39ee5fddd..8cd0c415f4 100644
--- a/indra/newview/skins/default/xui/en/menu_login.xml
+++ b/indra/newview/skins/default/xui/en/menu_login.xml
@@ -20,6 +20,18 @@
              function="Floater.Toggle"
              parameter="preferences" />
         </menu_item_call>
+        <menu_item_check
+         label="Show Grid Picker"
+         name="Show Grid Picker"
+         visible="false" 
+         shortcut="control|shift|G">
+        <on_check
+         function="CheckControl"
+         parameter="ForceShowGrid" />
+        <on_click
+         function="ToggleControl"
+         parameter="ForceShowGrid" />
+        </menu_item_check>
         <menu_item_separator />
         <menu_item_call
          label="Exit [APP_NAME]"
@@ -287,18 +299,6 @@
            parameter="4" />
         </menu_item_check>
       </menu>
-     <menu_item_check
-        label="Show Grid Picker"
-        name="Show Grid Picker"
-        visible="false" 
-        shortcut="control|shift|G">
-        <on_check
-         function="CheckControl"
-         parameter="ForceShowGrid" />
-        <on_click
-         function="ToggleControl"
-         parameter="ForceShowGrid" />
-      </menu_item_check>
       <menu_item_call
         label="Show Notifications Console"
         name="Show Notifications Console"
-- 
cgit v1.2.3