summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/skins/default/xui')
-rw-r--r--indra/newview/skins/default/xui/en/menu_viewer.xml32
-rw-r--r--indra/newview/skins/default/xui/en/panel_preferences_controls.xml2
-rw-r--r--indra/newview/skins/default/xui/en/panel_preferences_game_control.xml18
3 files changed, 22 insertions, 30 deletions
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">
@@ -2507,6 +2491,22 @@ function="World.EnvPreset"
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"
name="Consoles"
tear_off="true">
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,25 +6,17 @@
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"
label="Send GameControl Data to server"
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">