From 59ed92522f7b72731911825a831bab559f0c1c8b Mon Sep 17 00:00:00 2001
From: leviathan <leviathan@lindenlab.com>
Date: Wed, 17 Jul 2024 15:25:22 -0700
Subject: even more correct GameControl feature-flag switch

---
 indra/newview/skins/default/xui/en/menu_viewer.xml | 32 +++++++++++-----------
 .../default/xui/en/panel_preferences_controls.xml  |  2 +-
 .../xui/en/panel_preferences_game_control.xml      | 18 ++++--------
 3 files changed, 22 insertions(+), 30 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index f6946f5304..da9cc0c98d 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -2464,22 +2464,6 @@ function="World.EnvPreset"
 
         <menu_item_separator/>
 
-        <menu
-         create_jump_keys="true"
-         label="Experimental Features"
-         name="Experimental Features"
-         tear_off="true">
-            <menu_item_check
-             label="GameControl"
-             name="ToggleGameControl">
-             <menu_item_check.on_check
-                 function="Advanced.CheckExperiment"
-                 parameter="GameControl" />
-             <menu_item_check.on_click
-                 function="Advanced.ToggleExperiment"
-                 parameter="GameControl" />
-            </menu_item_check>
-        </menu>
         <menu_item_call
          label="Show Debug Settings"
          name="Debug Settings">
@@ -2505,6 +2489,22 @@ function="World.EnvPreset"
      name="Develop"
      tear_off="true"
      visible="false">
+        <menu
+         create_jump_keys="true"
+         label="Experimental Features"
+         name="Experimental Features"
+         tear_off="true">
+            <menu_item_check
+             label="GameControl"
+             name="ToggleGameControl">
+             <menu_item_check.on_check
+                 function="Advanced.CheckExperiment"
+                 parameter="GameControl" />
+             <menu_item_check.on_click
+                 function="Advanced.ToggleExperiment"
+                 parameter="GameControl" />
+            </menu_item_check>
+        </menu>
         <menu
          create_jump_keys="true"
          label="Consoles"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_controls.xml b/indra/newview/skins/default/xui/en/panel_preferences_controls.xml
index f8801f9c89..b02270dd9e 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_controls.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_controls.xml
@@ -6,7 +6,7 @@
  label="Controls"
  layout="topleft"
  left="102"
- name="controls"
+ name="controls_panel"
  top="1"
  width="517">
   <combo_box
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_game_control.xml b/indra/newview/skins/default/xui/en/panel_preferences_game_control.xml
index 8c9e15a180..bd92fe895d 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_game_control.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_game_control.xml
@@ -6,17 +6,9 @@
     label="Game Controls"
     layout="topleft"
     left="102"
-    name="gamecontrol"
+    name="game_control_panel"
     top="1"
     width="517">
-    <check_box
-        name="enable_game_control"
-        control_name="EnableGameControl"
-        label="Enable GameControl"
-        layout="topleft"
-        height="15"
-        left="10"
-        top="10"/>
     <check_box
         name="game_control_to_server"
         control_name="GameControlToServer"
@@ -24,7 +16,7 @@
         layout="topleft"
         height="15"
         left="10"
-        top="30"/>
+        top="10"/>
     <check_box
         name="game_control_to_agent"
         control_name="GameControlToAgent"
@@ -32,7 +24,7 @@
         layout="topleft"
         height="15"
         left="10"
-        top="50"/>
+        top="30"/>
     <check_box
         name="agent_to_game_control"
         control_name="AgentToGameControl"
@@ -40,12 +32,12 @@
         layout="topleft"
         height="15"
         left="10"
-        top="70"/>
+        top="50"/>
     <tab_container
         name="game_control_tabs"
         layout="topleft"
         follows="all"
-        top="90"
+        top="70"
         left="2"
         right="-2"
         bottom="-32">
-- 
cgit v1.2.3