diff options
Diffstat (limited to 'indra/newview/skins')
4 files changed, 330 insertions, 14 deletions
diff --git a/indra/newview/skins/default/xui/en/control_table_contents_game_control.xml b/indra/newview/skins/default/xui/en/control_table_contents_game_control.xml new file mode 100644 index 0000000000..a3a2d66e5e --- /dev/null +++ b/indra/newview/skins/default/xui/en/control_table_contents_game_control.xml @@ -0,0 +1,326 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<contents> + <rows + enabled="false" + name="game_control_buttons" + value=""> + <columns + type="icontext" + column="lst_action" + font="SansSerif" + halign="left" + label="Game Control Buttons" + name="lst_action" + value="Dpad" /> + </rows> + <rows + name="game_control_button_0" + value="game_control_button_0"> + <columns + column="lst_action" + font="SansSerif" + halign="left" + name="lst_action" + value="BUTTON_0" /> + </rows> + <rows + name="game_control_button_1" + value="game_control_button_1"> + <columns + column="lst_action" + font="SansSerif" + halign="left" + name="lst_action" + value="BUTTON_1" /> + </rows> + <rows + name="game_control_button_2" + value="game_control_button_2"> + <columns + column="lst_action" + font="SansSerif" + halign="left" + name="lst_action" + value="BUTTON_2" /> + </rows> + <rows + name="game_control_button_3" + value="game_control_button_3"> + <columns + column="lst_action" + font="SansSerif" + halign="left" + name="lst_action" + value="BUTTON_3" /> + </rows> + <rows + name="game_control_button_4" + value="game_control_button_4"> + <columns + column="lst_action" + font="SansSerif" + halign="left" + name="lst_action" + value="BUTTON_4" /> + </rows> + <rows + name="game_control_button_5" + value="game_control_button_5"> + <columns + column="lst_action" + font="SansSerif" + halign="left" + name="lst_action" + value="BUTTON_5" /> + </rows> + <rows + name="game_control_button_6" + value="game_control_button_6"> + <columns + column="lst_action" + font="SansSerif" + halign="left" + name="lst_action" + value="BUTTON_6" /> + </rows> + <rows + name="game_control_button_7" + value="game_control_button_7"> + <columns + column="lst_action" + font="SansSerif" + halign="left" + name="lst_action" + value="BUTTON_7" /> + </rows> + <rows + name="game_control_button_8" + value="game_control_button_8"> + <columns + column="lst_action" + font="SansSerif" + halign="left" + name="lst_action" + value="BUTTON_8" /> + </rows> + <rows + name="game_control_button_9" + value="game_control_button_9"> + <columns + column="lst_action" + font="SansSerif" + halign="left" + name="lst_action" + value="BUTTON_9" /> + </rows> + <rows + name="game_control_button_10" + value="game_control_button_10"> + <columns + column="lst_action" + font="SansSerif" + halign="left" + name="lst_action" + value="BUTTON_10" /> + </rows> + <rows + name="game_control_button_11" + value="game_control_button_11"> + <columns + column="lst_action" + font="SansSerif" + halign="left" + name="lst_action" + value="BUTTON_11" /> + </rows> + <rows + name="game_control_button_12" + value="game_control_button_12"> + <columns + column="lst_action" + font="SansSerif" + halign="left" + name="lst_action" + value="BUTTON_12" /> + </rows> + <rows + name="game_control_button_13" + value="game_control_button_13"> + <columns + column="lst_action" + font="SansSerif" + halign="left" + name="lst_action" + value="BUTTON_13" /> + </rows> + <rows + name="game_control_button_14" + value="game_control_button_14"> + <columns + column="lst_action" + font="SansSerif" + halign="left" + name="lst_action" + value="BUTTON_14" /> + </rows> + <rows + name="game_control_button_15" + value="game_control_button_15"> + <columns + column="lst_action" + font="SansSerif" + halign="left" + name="lst_action" + value="BUTTON_15" /> + </rows> + <rows + name="game_control_button_16" + value="game_control_button_16"> + <columns + column="lst_action" + font="SansSerif" + halign="left" + name="lst_action" + value="BUTTON_16" /> + </rows> + <rows + name="game_control_button_17" + value="game_control_button_17"> + <columns + column="lst_action" + font="SansSerif" + halign="left" + name="lst_action" + value="BUTTON_17" /> + </rows> + <rows + name="game_control_button_18" + value="game_control_button_18"> + <columns + column="lst_action" + font="SansSerif" + halign="left" + name="lst_action" + value="BUTTON_18" /> + </rows> + <rows + name="game_control_button_19" + value="game_control_button_19"> + <columns + column="lst_action" + font="SansSerif" + halign="left" + name="lst_action" + value="BUTTON_19" /> + </rows> + <rows + name="game_control_button_21" + value="game_control_button_21"> + <columns + column="lst_action" + font="SansSerif" + halign="left" + name="lst_action" + value="BUTTON_21" /> + </rows> + <rows + name="game_control_button_22" + value="game_control_button_22"> + <columns + column="lst_action" + font="SansSerif" + halign="left" + name="lst_action" + value="BUTTON_22" /> + </rows> + <rows + name="game_control_button_23" + value="game_control_button_23"> + <columns + column="lst_action" + font="SansSerif" + halign="left" + name="lst_action" + value="BUTTON_23" /> + </rows> + <rows + name="game_control_button_24" + value="game_control_button_24"> + <columns + column="lst_action" + font="SansSerif" + halign="left" + name="lst_action" + value="BUTTON_24" /> + </rows> + <rows + name="game_control_button_25" + value="game_control_button_25"> + <columns + column="lst_action" + font="SansSerif" + halign="left" + name="lst_action" + value="BUTTON_25" /> + </rows> + <rows + name="game_control_button_26" + value="game_control_button_26"> + <columns + column="lst_action" + font="SansSerif" + halign="left" + name="lst_action" + value="BUTTON_26" /> + </rows> + <rows + name="game_control_button_27" + value="game_control_button_27"> + <columns + column="lst_action" + font="SansSerif" + halign="left" + name="lst_action" + value="BUTTON_27" /> + </rows> + <rows + name="game_control_button_28" + value="game_control_button_28"> + <columns + column="lst_action" + font="SansSerif" + halign="left" + name="lst_action" + value="BUTTON_28" /> + </rows> + <rows + name="game_control_button_29" + value="game_control_button_29"> + <columns + column="lst_action" + font="SansSerif" + halign="left" + name="lst_action" + value="BUTTON_29" /> + </rows> + <rows + name="game_control_button_30" + value="game_control_button_30"> + <columns + column="lst_action" + font="SansSerif" + halign="left" + name="lst_action" + value="BUTTON_30" /> + </rows> + <rows + name="game_control_button_31" + value="game_control_button_31"> + <columns + column="lst_action" + font="SansSerif" + halign="left" + name="lst_action" + value="BUTTON_31" /> + </rows> +</contents> diff --git a/indra/newview/skins/default/xui/en/game_control_table_camera_rows.xml b/indra/newview/skins/default/xui/en/game_control_table_camera_rows.xml index b2381c8493..6074b72dc8 100644 --- a/indra/newview/skins/default/xui/en/game_control_table_camera_rows.xml +++ b/indra/newview/skins/default/xui/en/game_control_table_camera_rows.xml @@ -14,15 +14,15 @@ value="Cam_FreeCam_Off" /> </rows> <rows - name="move" - value="move"> + name="advance" + value="advance"> <columns column="action" font="SansSerif" halign="left" name="action" tool_tip="Camera move forward/backward" - value="Move Forward" /> + value="Advance Forward" /> </rows> <rows name="pan" diff --git a/indra/newview/skins/default/xui/en/game_control_table_rows.xml b/indra/newview/skins/default/xui/en/game_control_table_rows.xml index 90e6990842..b09346e83e 100644 --- a/indra/newview/skins/default/xui/en/game_control_table_rows.xml +++ b/indra/newview/skins/default/xui/en/game_control_table_rows.xml @@ -95,16 +95,6 @@ value="Fly" /> </rows> <rows - name="toggle_sit" - value="toggle_sit"> - <columns - column="action" - font="SansSerif" - halign="left" - name="action" - value="Sit" /> - </rows> - <rows name="toggle_flycam" value="toggle_flycam"> <columns 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 d48c0fe0d2..074e27215d 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 @@ -33,7 +33,7 @@ control_name="AgentToGameControl" follows="top|left" height="15" - label="Avatar and flycam actions interpreted as GameControl" + label="Avatar actions interpreted as GameControl" layout="topleft" left="10" name="agent_to_game_control" |