From 13221f67c465017f44ca46aeca23b0d820935825 Mon Sep 17 00:00:00 2001
From: Leviathan Linden <leviathan@lindenlab.com>
Date: Tue, 19 Sep 2023 09:40:08 -0700
Subject: add GameControl feature and SDL2 dependency

---
 .../skins/default/xui/en/floater_preferences.xml   |  7 +++++
 .../xui/en/panel_preferences_game_controls.xml     | 32 ++++++++++++++++++++++
 2 files changed, 39 insertions(+)
 create mode 100644 indra/newview/skins/default/xui/en/panel_preferences_game_controls.xml

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_preferences.xml b/indra/newview/skins/default/xui/en/floater_preferences.xml
index 4b0e0bb221..4614f2f06c 100644
--- a/indra/newview/skins/default/xui/en/floater_preferences.xml
+++ b/indra/newview/skins/default/xui/en/floater_preferences.xml
@@ -170,6 +170,13 @@
          layout="topleft"
          help_topic="preferences_controls_tab"
          name="controls" />
+        <panel
+         class="panel_preference_game_controls"
+         filename="panel_preferences_game_controls.xml"
+         label="Game Controls"
+         layout="topleft"
+         help_topic="preferences_game_controls_tab"
+         name="gamecontrols" />
     </tab_container>
 
 </floater>
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_game_controls.xml b/indra/newview/skins/default/xui/en/panel_preferences_game_controls.xml
new file mode 100644
index 0000000000..4b693e8955
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_preferences_game_controls.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<panel
+ border="true"
+ follows="all"
+ height="408"
+ label="Game Controls"
+ layout="topleft"
+ left="102"
+ name="gamecontrols"
+ top="1"
+ width="517">
+  <check_box
+   control_name="EnableGameControlInput"
+   follows="top|left"
+   height="15"
+   label="Send GameControl Input to server"
+   layout="topleft"
+   left="10"
+   name="enable_game_control_input"
+   top="6"
+   width="232"/>
+  <check_box
+   control_name="EnableGameControlKeyboardInput"
+   follows="top|left"
+   height="15"
+   label="Include otherwise 'unhandled' Keyboard events in GameControl Input"
+   layout="topleft"
+   left="10"
+   name="game_control_keyboard_input"
+   top="27"
+   width="232"/>
+</panel>
-- 
cgit v1.2.3


From ed6ecca2a45e52d9be1d91107b9643b5ecdfb8bf Mon Sep 17 00:00:00 2001
From: Leviathan Linden <leviathan@lindenlab.com>
Date: Thu, 16 Nov 2023 13:53:37 -0800
Subject: avatar_motion-->GameControl translation and flycam

---
 .../skins/default/textures/bottomtray/Dpad.png     | Bin 0 -> 765 bytes
 .../skins/default/xui/en/floater_joystick.xml      |  36 +--
 .../skins/default/xui/en/floater_preferences.xml   |  10 +-
 .../xui/en/game_control_table_camera_rows.xml      | 106 +++++++++
 .../default/xui/en/game_control_table_columns.xml  |  15 ++
 .../default/xui/en/game_control_table_rows.xml     | 117 ++++++++++
 .../xui/en/panel_preferences_game_control.xml      | 244 +++++++++++++++++++++
 .../xui/en/panel_preferences_game_controls.xml     |  32 ---
 .../default/xui/en/panel_preferences_move.xml      |   2 +-
 9 files changed, 506 insertions(+), 56 deletions(-)
 create mode 100644 indra/newview/skins/default/textures/bottomtray/Dpad.png
 create mode 100644 indra/newview/skins/default/xui/en/game_control_table_camera_rows.xml
 create mode 100644 indra/newview/skins/default/xui/en/game_control_table_columns.xml
 create mode 100644 indra/newview/skins/default/xui/en/game_control_table_rows.xml
 create mode 100644 indra/newview/skins/default/xui/en/panel_preferences_game_control.xml
 delete mode 100644 indra/newview/skins/default/xui/en/panel_preferences_game_controls.xml

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/textures/bottomtray/Dpad.png b/indra/newview/skins/default/textures/bottomtray/Dpad.png
new file mode 100644
index 0000000000..00fcb4beea
Binary files /dev/null and b/indra/newview/skins/default/textures/bottomtray/Dpad.png differ
diff --git a/indra/newview/skins/default/xui/en/floater_joystick.xml b/indra/newview/skins/default/xui/en/floater_joystick.xml
index e6f0420698..597744238c 100644
--- a/indra/newview/skins/default/xui/en/floater_joystick.xml
+++ b/indra/newview/skins/default/xui/en/floater_joystick.xml
@@ -3,9 +3,9 @@
  legacy_header_height="18"
  height="500"
  layout="topleft"
- name="Joystick"
+ name="3Dconnexion Device"
  help_topic="Viewerhelp:Joystick_Configuration"
- title="JOYSTICK CONFIGURATION"
+ title="3DCONNEXION DEVICE CONFIGURATION"
  width="569">
     <floater.string
      name="JoystickDisabled">
@@ -22,7 +22,7 @@
      width="50"
      mouse_opaque="false"
      name="joystick_lbl">
-      Joystick:
+      Device:
     </text>
     <combo_box
      allow_text_entry="false"
@@ -35,7 +35,7 @@
     <spinner
      bottom="56"
      height="10"
-     control_name="JoystickAxis1"
+     control_name="Axis1"
      decimal_digits="0"
      increment="1"
      label="X Axis Mapping"
@@ -44,12 +44,12 @@
      left="20"
      max_val="5"
      min_val="-1"
-     name="JoystickAxis1"
+     name="Axis1"
      width="140" />
     <spinner
      bottom_delta="0"
      height="10"     
-     control_name="JoystickAxis2"
+     control_name="Axis2"
      decimal_digits="0"
      increment="1"
      label="Y Axis Mapping"
@@ -58,12 +58,12 @@
      left="190"
      max_val="5"
      min_val="-1"
-     name="JoystickAxis2"
+     name="Axis2"
      width="140" />
     <spinner
      bottom_delta="0"
      height="10"     
-     control_name="JoystickAxis0"
+     control_name="Axis0"
      decimal_digits="0"
      increment="1"
      label="Z Axis Mapping"
@@ -72,12 +72,12 @@
      left="360"
      max_val="5"
      min_val="-1"
-     name="JoystickAxis0"
+     name="Axis0"
      width="140" />
     <spinner
      bottom="76"
      height="10"     
-     control_name="JoystickAxis4"
+     control_name="Axis4"
      decimal_digits="0"
      increment="1"
      label="Pitch Mapping"
@@ -86,12 +86,12 @@
      left="20"
      max_val="5"
      min_val="-1"
-     name="JoystickAxis4"
+     name="Axis4"
      width="140" />
     <spinner
      bottom_delta="0"
      height="10"     
-     control_name="JoystickAxis5"
+     control_name="Axis5"
      decimal_digits="0"
      increment="1"
      label="Yaw Mapping"
@@ -100,12 +100,12 @@
      left="190"
      max_val="5"
      min_val="-1"
-     name="JoystickAxis5"
+     name="Axis5"
      width="140" />
     <spinner
      bottom_delta="0"
      height="10"     
-     control_name="JoystickAxis3"
+     control_name="Axis3"
      decimal_digits="0"
      increment="1"
      label="Roll Mapping"
@@ -114,12 +114,12 @@
      left="360"
      max_val="5"
      min_val="-1"
-     name="JoystickAxis3"
+     name="Axis3"
      width="140" />
     <spinner
      bottom="96"
      height="10"     
-     control_name="JoystickAxis6"
+     control_name="Axis6"
      decimal_digits="0"
      increment="1"
      label="Zoom Mapping"
@@ -128,7 +128,7 @@
      left="20"
      max_val="5"
      min_val="-1"
-     name="JoystickAxis6"
+     name="Axis6"
      width="140" />
     <check_box
      bottom_delta="18"
@@ -203,7 +203,7 @@
      width="60" />
     <stat_view
      height="270"
-     label="Joystick Monitor"
+     label="Axis Monitor"
      layout="topleft"
      left="359"
      name="axis_view"
diff --git a/indra/newview/skins/default/xui/en/floater_preferences.xml b/indra/newview/skins/default/xui/en/floater_preferences.xml
index 4614f2f06c..e0dc538af4 100644
--- a/indra/newview/skins/default/xui/en/floater_preferences.xml
+++ b/indra/newview/skins/default/xui/en/floater_preferences.xml
@@ -171,12 +171,12 @@
          help_topic="preferences_controls_tab"
          name="controls" />
         <panel
-         class="panel_preference_game_controls"
-         filename="panel_preferences_game_controls.xml"
-         label="Game Controls"
+         class="panel_preference_game_control"
+         filename="panel_preferences_game_control.xml"
+         label="Game Control"
          layout="topleft"
-         help_topic="preferences_game_controls_tab"
-         name="gamecontrols" />
+         help_topic="preferences_game_control_tab"
+         name="game_control" />
     </tab_container>
 
 </floater>
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
new file mode 100644
index 0000000000..b2381c8493
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/game_control_table_camera_rows.xml
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<contents>
+    <rows
+     enabled="false"
+     name="camera_actions"
+     value="">
+        <columns
+         type="icontext"
+         column="action"
+         font="SansSerif"
+         halign="left"
+         label="Camera"
+         name="action"
+         value="Cam_FreeCam_Off" />
+    </rows>
+    <rows
+     name="move"
+     value="move">
+        <columns
+         column="action"
+         font="SansSerif"
+         halign="left"
+         name="action"
+         tool_tip="Camera move forward/backward"
+         value="Move Forward" />
+    </rows>
+    <rows
+     name="pan"
+     value="pan">
+        <columns
+         column="action"
+         font="SansSerif"
+         halign="left"
+         name="action"
+         tool_tip="Camera pan left/right"
+         value="Pan Left" />
+    </rows>
+    <rows
+     name="rise"
+     value="rise">
+        <columns
+         column="action"
+         font="SansSerif"
+         halign="left"
+         name="action"
+         tool_tip="Camera rise/fall"
+         value="Rise Up" />
+    </rows>
+    <rows
+     name="pitch"
+     value="pitch">
+        <columns
+         column="action"
+         font="SansSerif"
+         halign="left"
+         name="action"
+         tool_tip="Camera adjust pitch"
+         value="Pitch Down" />
+    </rows>
+    <rows
+     name="yaw"
+     value="yaw">
+        <columns
+         column="action"
+         font="SansSerif"
+         halign="left"
+         name="action"
+         tool_tip="Camera turn left/right"
+         value="Yaw CCW" />
+    </rows>
+    <rows
+     name="zoom"
+     value="zoom">
+        <columns
+         column="action"
+         font="SansSerif"
+         halign="left"
+         name="action"
+         tool_tip="Camera zoom in/out"
+         value="Zoom In" />
+    </rows>
+    <!--
+    <rows
+     name="roll_ccw"
+     value="roll_ccw">
+        <columns
+         column="action"
+         font="SansSerif"
+         halign="left"
+         name="action"
+         tool_tip="Camera roll counterclockwise"
+         value="Roll Counterclockwise" />
+    </rows>
+    <rows
+     name="roll_cw"
+     value="roll_cw">
+        <columns
+         column="action"
+         font="SansSerif"
+         halign="left"
+         name="action"
+         tool_tip="Camera roll clockwise"
+         value="Roll Clockwise" />
+    </rows>
+    -->
+</contents>
diff --git a/indra/newview/skins/default/xui/en/game_control_table_columns.xml b/indra/newview/skins/default/xui/en/game_control_table_columns.xml
new file mode 100644
index 0000000000..f88fc8305c
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/game_control_table_columns.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<contents>
+    <columns
+        relative_width="0.25"
+        label="Action"
+        name="action" />
+    <columns
+        relative_width="0.25"
+        label="GameControl"
+        name="index" />
+    <columns
+        relative_width="0.50"
+        label=" "
+        name="foo" />
+</contents>
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
new file mode 100644
index 0000000000..90e6990842
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/game_control_table_rows.xml
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<contents>
+    <rows
+     enabled="false"
+     name="move_actions"
+     value="">
+        <columns
+         type="icontext"
+         column="action"
+         font="SansSerif"
+         halign="left"
+         label="Move Actions"
+         name="action"
+         value="Move_Walk_Off" />
+    </rows>
+    <rows
+     name="push"
+     value="push">
+        <columns
+         column="action"
+         font="SansSerif"
+         halign="left"
+         name="action"
+         value="Walk Forward" />
+    </rows>
+    <rows
+     name="slide"
+     value="slide">
+        <columns
+         column="action"
+         font="SansSerif"
+         halign="left"
+         name="action"
+         value="Strafe Left" />
+    </rows>
+    <rows
+     name="jump"
+     value="jump">
+        <columns
+         column="action"
+         font="SansSerif"
+         halign="left"
+         name="action"
+         value="Jump Up" />
+    </rows>
+    <rows
+     name="turn"
+     value="turn">
+        <columns
+         column="action"
+         font="SansSerif"
+         halign="left"
+         name="action"
+         value="Turn Left" />
+    </rows>
+    <rows
+     name="look"
+     value="look">
+        <columns
+         column="action"
+         font="SansSerif"
+         halign="left"
+         name="action"
+         value="Look Down" />
+    </rows>
+
+    <rows
+     name="stop"
+     value="stop">
+        <columns
+         column="action"
+         font="SansSerif"
+         halign="left"
+         name="action"
+         value="Stop" />
+    </rows>
+    <rows
+     name="toggle_run"
+     value="toggle_run">
+        <columns
+         column="action"
+         font="SansSerif"
+         halign="left"
+         name="action"
+         value="Run" />
+    </rows>
+    <rows
+     name="toggle_fly"
+     value="toggle_fly">
+        <columns
+         column="action"
+         font="SansSerif"
+         halign="left"
+         name="action"
+         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
+         column="action"
+         font="SansSerif"
+         halign="left"
+         name="action"
+         value="Flycam" />
+    </rows>
+</contents>
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
new file mode 100644
index 0000000000..d48c0fe0d2
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_preferences_game_control.xml
@@ -0,0 +1,244 @@
+<?xml version="1.0" encoding="utf-8"?>
+<panel
+    border="true"
+    follows="all"
+    height="408"
+    label="Game Controls"
+    layout="topleft"
+    left="102"
+    name="gamecontrol"
+    top="1"
+    width="517">
+    <check_box
+        control_name="GameControlToServer"
+        follows="top|left"
+        height="15"
+        label="Send GameControl Data to server"
+        layout="topleft"
+        left="10"
+        name="game_control_to_server"
+        top="6"
+        width="232"/>
+    <check_box
+        control_name="GameControlToAgent"
+        follows="top|left"
+        height="15"
+        label="GameControl moves avatar and flycam"
+        layout="topleft"
+        left="10"
+        name="game_control_to_agent"
+        top="27"
+        width="232"/>
+    <check_box
+        control_name="AgentToGameControl"
+        follows="top|left"
+        height="15"
+        label="Avatar and flycam actions interpreted as GameControl"
+        layout="topleft"
+        left="10"
+        name="agent_to_game_control"
+        top="48"
+        width="232"/>
+    <scroll_list
+        draw_heading="true"
+        follows="all"
+        layout="topleft"
+        column_padding="0"
+        selection_type="header"
+        top="66"
+        left="3"
+        bottom="-3"
+        right="-3"
+        can_sort="false"
+        multi_select="false"
+        name="action_table"
+        fg_disable_color="ScrollUnselectedColor"/>
+    <combo_box
+        height="23"
+        layout="topleft"
+        left="10"
+        name="input_channel_combo"
+        top_pad="5"
+        width="90">
+        <combo_box.item
+            label="AXIS_0-"
+            name="AXIS_0-"
+            value="AXIS_0-"/>
+        <combo_box.item
+            label="AXIS_0+"
+            name="AXIS_0+"
+            value="AXIS_0+"/>
+        <combo_box.item
+            label="AXIS_1-"
+            name="AXIS_1-"
+            value="AXIS_1-"/>
+        <combo_box.item
+            label="AXIS_1+"
+            name="AXIS_1+"
+            value="AXIS_1+"/>
+        <combo_box.item
+            label="AXIS_2-"
+            name="AXIS_2-"
+            value="AXIS_2-"/>
+        <combo_box.item
+            label="AXIS_2+"
+            name="AXIS_2+"
+            value="AXIS_2+"/>
+        <combo_box.item
+            label="AXIS_3-"
+            name="AXIS_3-"
+            value="AXIS_3-"/>
+        <combo_box.item
+            label="AXIS_3+"
+            name="AXIS_3+"
+            value="AXIS_3+"/>
+        <combo_box.item
+            label="AXIS_4-"
+            name="AXIS_4-"
+            value="AXIS_4-"/>
+        <combo_box.item
+            label="AXIS_4+"
+            name="AXIS_4+"
+            value="AXIS_4+"/>
+        <combo_box.item
+            label="AXIS_5-"
+            name="AXIS_5-"
+            value="AXIS_5-"/>
+        <combo_box.item
+            label="AXIS_5+"
+            name="AXIS_5+"
+            value="AXIS_5+"/>
+        <combo_box.item
+            label="BUTTON_0"
+            name="BUTTON_0"
+            value="BUTTON_0"/>
+        <combo_box.item
+            label="BUTTON_1"
+            name="BUTTON_1"
+            value="BUTTON_1"/>
+        <combo_box.item
+            label="BUTTON_2"
+            name="BUTTON_2"
+            value="BUTTON_2"/>
+        <combo_box.item
+            label="BUTTON_3"
+            name="BUTTON_3"
+            value="BUTTON_3"/>
+        <combo_box.item
+            label="BUTTON_4"
+            name="BUTTON_4"
+            value="BUTTON_4"/>
+        <combo_box.item
+            label="BUTTON_5"
+            name="BUTTON_5"
+            value="BUTTON_5"/>
+        <combo_box.item
+            label="BUTTON_6"
+            name="BUTTON_6"
+            value="BUTTON_6"/>
+        <combo_box.item
+            label="BUTTON_7"
+            name="BUTTON_7"
+            value="BUTTON_7"/>
+        <combo_box.item
+            label="BUTTON_8"
+            name="BUTTON_8"
+            value="BUTTON_8"/>
+        <combo_box.item
+            label="BUTTON_9"
+            name="BUTTON_9"
+            value="BUTTON_9"/>
+        <combo_box.item
+            label="BUTTON_10"
+            name="BUTTON_10"
+            value="BUTTON_10"/>
+        <combo_box.item
+            label="BUTTON_11"
+            name="BUTTON_11"
+            value="BUTTON_11"/>
+        <combo_box.item
+            label="BUTTON_12"
+            name="BUTTON_12"
+            value="BUTTON_12"/>
+        <combo_box.item
+            label="BUTTON_13"
+            name="BUTTON_13"
+            value="BUTTON_13"/>
+        <combo_box.item
+            label="BUTTON_14"
+            name="BUTTON_14"
+            value="BUTTON_14"/>
+        <combo_box.item
+            label="BUTTON_15"
+            name="BUTTON_15"
+            value="BUTTON_15"/>
+        <combo_box.item
+            label="BUTTON_16"
+            name="BUTTON_16"
+            value="BUTTON_16"/>
+        <combo_box.item
+            label="BUTTON_17"
+            name="BUTTON_17"
+            value="BUTTON_17"/>
+        <combo_box.item
+            label="BUTTON_18"
+            name="BUTTON_18"
+            value="BUTTON_18"/>
+        <combo_box.item
+            label="BUTTON_19"
+            name="BUTTON_19"
+            value="BUTTON_19"/>
+        <combo_box.item
+            label="BUTTON_20"
+            name="BUTTON_20"
+            value="BUTTON_20"/>
+        <combo_box.item
+            label="BUTTON_21"
+            name="BUTTON_21"
+            value="BUTTON_21"/>
+        <combo_box.item
+            label="BUTTON_22"
+            name="BUTTON_22"
+            value="BUTTON_22"/>
+        <combo_box.item
+            label="BUTTON_23"
+            name="BUTTON_23"
+            value="BUTTON_23"/>
+        <combo_box.item
+            label="BUTTON_24"
+            name="BUTTON_24"
+            value="BUTTON_24"/>
+        <combo_box.item
+            label="BUTTON_25"
+            name="BUTTON_25"
+            value="BUTTON_25"/>
+        <combo_box.item
+            label="BUTTON_26"
+            name="BUTTON_26"
+            value="BUTTON_26"/>
+        <combo_box.item
+            label="BUTTON_27"
+            name="BUTTON_27"
+            value="BUTTON_27"/>
+        <combo_box.item
+            label="BUTTON_28"
+            name="BUTTON_28"
+            value="BUTTON_28"/>
+        <combo_box.item
+            label="BUTTON_29"
+            name="BUTTON_29"
+            value="BUTTON_29"/>
+        <combo_box.item
+            label="BUTTON_30"
+            name="BUTTON_30"
+            value="BUTTON_30"/>
+        <combo_box.item
+            label="BUTTON_31"
+            name="BUTTON_31"
+            value="BUTTON_31"/>
+        <combo_box.item
+            label="NONE"
+            name="NONE"
+            value="NONE"/>
+    </combo_box>
+</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_game_controls.xml b/indra/newview/skins/default/xui/en/panel_preferences_game_controls.xml
deleted file mode 100644
index 4b693e8955..0000000000
--- a/indra/newview/skins/default/xui/en/panel_preferences_game_controls.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<panel
- border="true"
- follows="all"
- height="408"
- label="Game Controls"
- layout="topleft"
- left="102"
- name="gamecontrols"
- top="1"
- width="517">
-  <check_box
-   control_name="EnableGameControlInput"
-   follows="top|left"
-   height="15"
-   label="Send GameControl Input to server"
-   layout="topleft"
-   left="10"
-   name="enable_game_control_input"
-   top="6"
-   width="232"/>
-  <check_box
-   control_name="EnableGameControlKeyboardInput"
-   follows="top|left"
-   height="15"
-   label="Include otherwise 'unhandled' Keyboard events in GameControl Input"
-   layout="topleft"
-   left="10"
-   name="game_control_keyboard_input"
-   top="27"
-   width="232"/>
-</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_move.xml b/indra/newview/skins/default/xui/en/panel_preferences_move.xml
index 0412466b4f..8a372256dc 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_move.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_move.xml
@@ -270,7 +270,7 @@
    width="200" />
   <button
    height="23"
-   label="Other Devices"
+   label="3Dconnexion devices"
    left="30"
    name="joystick_setup_button"
    top="30"
-- 
cgit v1.2.3


From ec39ac89e8529da206dafd519d75ad5944888076 Mon Sep 17 00:00:00 2001
From: leviathan <leviathan@lindenlab.com>
Date: Fri, 1 Mar 2024 14:04:54 -0800
Subject: more GameControl prefs UI

---
 .../xui/en/control_table_contents_game_control.xml | 326 +++++++++++++++++++++
 .../xui/en/game_control_table_camera_rows.xml      |   6 +-
 .../default/xui/en/game_control_table_rows.xml     |  10 -
 .../xui/en/panel_preferences_game_control.xml      |   2 +-
 4 files changed, 330 insertions(+), 14 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/en/control_table_contents_game_control.xml

(limited to 'indra/newview/skins')

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
@@ -94,16 +94,6 @@
          name="action"
          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">
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"
-- 
cgit v1.2.3


From 2daf175650cdda7cc8f820b6cb17b1475496e7ac Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Wed, 8 May 2024 23:32:58 +0200
Subject: Add GameControl UI for per device settings

---
 .../default/xui/en/game_control_table_columns.xml  |  15 -
 .../default/xui/en/game_control_table_rows.xml     |   1 -
 .../xui/en/panel_preferences_game_control.xml      | 332 ++++++++++++++++-----
 3 files changed, 265 insertions(+), 83 deletions(-)
 delete mode 100644 indra/newview/skins/default/xui/en/game_control_table_columns.xml

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/game_control_table_columns.xml b/indra/newview/skins/default/xui/en/game_control_table_columns.xml
deleted file mode 100644
index f88fc8305c..0000000000
--- a/indra/newview/skins/default/xui/en/game_control_table_columns.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<contents>
-    <columns
-        relative_width="0.25"
-        label="Action"
-        name="action" />
-    <columns
-        relative_width="0.25"
-        label="GameControl"
-        name="index" />
-    <columns
-        relative_width="0.50"
-        label=" "
-        name="foo" />
-</contents>
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 b09346e83e..181bc8592c 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
@@ -63,7 +63,6 @@
          name="action"
          value="Look Down" />
     </rows>
-
     <rows
      name="stop"
      value="stop">
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 074e27215d..1815d98ae0 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
@@ -10,186 +10,384 @@
     top="1"
     width="517">
     <check_box
+        name="game_control_to_server"
         control_name="GameControlToServer"
-        follows="top|left"
-        height="15"
         label="Send GameControl Data to server"
         layout="topleft"
+        height="15"
         left="10"
-        name="game_control_to_server"
-        top="6"
-        width="232"/>
+        top="10"/>
     <check_box
+        name="game_control_to_agent"
         control_name="GameControlToAgent"
-        follows="top|left"
-        height="15"
         label="GameControl moves avatar and flycam"
         layout="topleft"
+        height="15"
         left="10"
-        name="game_control_to_agent"
-        top="27"
-        width="232"/>
+        top="30"/>
     <check_box
+        name="agent_to_game_control"
         control_name="AgentToGameControl"
-        follows="top|left"
-        height="15"
         label="Avatar actions interpreted as GameControl"
         layout="topleft"
+        height="15"
         left="10"
-        name="agent_to_game_control"
-        top="48"
-        width="232"/>
-    <scroll_list
-        draw_heading="true"
+        top="50"/>
+    <tab_container
+        name="game_control_tabs"
+        layout="topleft"
         follows="all"
+        top="70"
+        left="2"
+        right="-2"
+        bottom="-32">
+        <panel
+            name="tab_channel_mappings"
+            label="Channel mappings">
+            <scroll_list
+                name="action_table"
+                layout="topleft"
+                follows="all"
+                top="1"
+                left="6"
+                right="-5"
+                bottom="-4"
+                can_sort="false"
+                column_padding="0"
+                multi_select="false"
+                selection_type="header"
+                fg_disable_color="ScrollUnselectedColor">
+                <scroll_list.columns
+                    name="action"
+                    label="Action"
+                    relative_width="0.25" />
+                <scroll_list.columns
+                    label="Channel"
+                    relative_width="0.75" />
+            </scroll_list>
+        </panel>
+        <panel
+            name="tab_device_settings"
+            label="Device settings">
+            <text
+                type="string"
+                name="nodevice_message"
+                layout="topleft"
+                follows="all"
+                halign="center"
+                valign="center"
+                top="1"
+                left="1"
+                right="-1"
+                bottom="-1">No device</text>
+            <panel
+                layout="topleft"
+                follows="top|left|right"
+                top="1"
+                left="1"
+                right="-1"
+                height="60">
+                <text
+                    type="string"
+                    name="device_prompt"
+                    layout="topleft"
+                    follows="top|left"
+                    valign="center"
+                    top="10"
+                    left="2"
+                    height="21"
+                    width="200">Device to customize:</text>
+                <text
+                    type="string"
+                    name="single_device"
+                    layout="topleft"
+                    follows="top|left"
+                    valign="center"
+                    top="30"
+                    left="2"
+                    height="21"
+                    width="500"/>
+                <combo_box
+                    name="device_list"
+                    layout="topleft"
+                    follows="top|left"
+                    top="30"
+                    left="2"
+                    width="500"/>
+            </panel>
+            <!-- This checkbox should be placed inside the above panel -->
+            <check_box
+                name="show_all_known_devices"
+                label="Show all known devices"
+                layout="topleft"
+                follows="top|left"
+                top_delta="10"
+                left="310"/>
+            <panel
+                name="device_settings"
+                layout="topleft"
+                follows="all"
+                top="61"
+                left="1"
+                right="-1"
+                bottom="-1">
+                <tab_container
+                    name="device_settings_tabs"
+                    layout="topleft"
+                    follows="all"
+                    top="1"
+                    left="1"
+                    right="-1"
+                    bottom="-1">
+                    <panel
+                        name="tab_axis_options"
+                        label="Axis Options">
+                        <scroll_list
+                            name="axis_options"
+                            follows="all"
+                            top="41"
+                            left="1"
+                            right="-1"
+                            bottom="-1"
+                            can_sort="false"
+                            column_padding="0"
+                            draw_heading="true"
+                            multi_select="false"
+                            selection_type="header"
+                            fg_disable_color="ScrollUnselectedColor">
+                            <scroll_list.columns
+                                label="Axis"
+                                relative_width="0.5"/>
+                            <scroll_list.columns
+                                label="Invert"
+                                relative_width="0.1"/>
+                            <scroll_list.columns
+                                label="Dead Zone"
+                                relative_width="0.2"/>
+                            <scroll_list.columns
+                                label="Offset"
+                                relative_width="0.2"/>
+                        </scroll_list>
+                    </panel>
+                    <panel
+                        name="tab_axis_mappings"
+                        label="Axis Mappings">
+                        <scroll_list
+                            name="axis_mappings"
+                            follows="all"
+                            top="1"
+                            left="1"
+                            right="-1"
+                            bottom="-1"
+                            can_sort="false"
+                            column_padding="0"
+                            multi_select="false"
+                            selection_type="header"
+                            fg_disable_color="ScrollUnselectedColor">
+                            <scroll_list.columns relative_width="0.5"/>
+                            <scroll_list.columns relative_width="0.5"/>
+                        </scroll_list>
+                    </panel>
+                    <panel
+                        name="tab_button_mappings"
+                        label="Button Mappings">
+                        <scroll_list
+                            name="button_mappings"
+                            follows="all"
+                            top="1"
+                            left="1"
+                            right="-1"
+                            bottom="-1"
+                            can_sort="false"
+                            column_padding="0"
+                            multi_select="false"
+                            selection_type="header"
+                            fg_disable_color="ScrollUnselectedColor">
+                            <scroll_list.columns relative_width="0.5"/>
+                            <scroll_list.columns relative_width="0.5"/>
+                        </scroll_list>
+                    </panel>
+                </tab_container>
+            </panel>
+        </panel>
+    </tab_container>
+    <panel
         layout="topleft"
-        column_padding="0"
-        selection_type="header"
-        top="66"
-        left="3"
-        bottom="-3"
-        right="-3"
-        can_sort="false"
-        multi_select="false"
-        name="action_table"
-        fg_disable_color="ScrollUnselectedColor"/>
+        follows="top|left"
+        top="405"
+        height="41"
+        left="1"
+        right="-1">
+        <button
+            layout="topleft"
+            follows="top|left"
+            name="reset_to_defaults"
+            label="Reset to Defaults"
+            top="1"
+            left="8"
+            width="200"/>
+    </panel>
+    <spinner
+        name="numeric_value_editor"
+        decimal_digits="0"
+        increment="1"
+        width="100"
+        height="18"/>
     <combo_box
-        height="23"
-        layout="topleft"
-        left="10"
-        name="input_channel_combo"
-        top_pad="5"
-        width="90">
+        name="axis_selector"
+        width="250"
+        height="18">
+        <combo_box.item label="AXIS_0 (Left stick: tilt left/right)"/>
+        <combo_box.item label="AXIS_1 (Left stick: tilt forward/back)"/>
+        <combo_box.item label="AXIS_2 (Right stick: tilt left/right)"/>
+        <combo_box.item label="AXIS_3 (Right stick: tilt forward/back)"/>
+        <combo_box.item label="AXIS_4 (Left trigger: push/release)"/>
+        <combo_box.item label="AXIS_5 (Right trigger: push/release)"/>
+        <combo_box.item label="NONE (No mapping)"/>
+    </combo_box>
+    <combo_box
+        name="analog_channel_selector"
+        width="380"
+        height="18">
         <combo_box.item
-            label="AXIS_0-"
+            label="AXIS_0- (Left stick: tilt right)"
             name="AXIS_0-"
             value="AXIS_0-"/>
         <combo_box.item
-            label="AXIS_0+"
+            label="AXIS_0+ (Left stick: tilt left)"
             name="AXIS_0+"
             value="AXIS_0+"/>
         <combo_box.item
-            label="AXIS_1-"
+            label="AXIS_1- (Left stick: tilt back)"
             name="AXIS_1-"
             value="AXIS_1-"/>
         <combo_box.item
-            label="AXIS_1+"
+            label="AXIS_1+ (Left stick: tilt forward)"
             name="AXIS_1+"
             value="AXIS_1+"/>
         <combo_box.item
-            label="AXIS_2-"
+            label="AXIS_2- (Right stick: tilt right)"
             name="AXIS_2-"
             value="AXIS_2-"/>
         <combo_box.item
-            label="AXIS_2+"
+            label="AXIS_2+ (Right stick: tilt left)"
             name="AXIS_2+"
             value="AXIS_2+"/>
         <combo_box.item
-            label="AXIS_3-"
+            label="AXIS_3- (Right stick: tilt back)"
             name="AXIS_3-"
             value="AXIS_3-"/>
         <combo_box.item
-            label="AXIS_3+"
+            label="AXIS_3+ (Right stick: tilt forward)"
             name="AXIS_3+"
             value="AXIS_3+"/>
         <combo_box.item
-            label="AXIS_4-"
+            label="AXIS_4- (Left trigger: release)"
             name="AXIS_4-"
             value="AXIS_4-"/>
         <combo_box.item
-            label="AXIS_4+"
+            label="AXIS_4+ (Left trigger: push)"
             name="AXIS_4+"
             value="AXIS_4+"/>
         <combo_box.item
-            label="AXIS_5-"
+            label="AXIS_5- (Right trigger: release)"
             name="AXIS_5-"
             value="AXIS_5-"/>
         <combo_box.item
-            label="AXIS_5+"
+            label="AXIS_5+ (Right trigger: push)"
             name="AXIS_5+"
             value="AXIS_5+"/>
         <combo_box.item
-            label="BUTTON_0"
+            label="NONE (No mapping)"
+            name="NONE"
+            value="NONE"/>
+    </combo_box>
+    <combo_box
+        name="binary_channel_selector"
+        width="380"
+        height="18">
+        <combo_box.item
+            label="BUTTON_0 ('A' button)"
             name="BUTTON_0"
             value="BUTTON_0"/>
         <combo_box.item
-            label="BUTTON_1"
+            label="BUTTON_1 ('B' button)"
             name="BUTTON_1"
             value="BUTTON_1"/>
         <combo_box.item
-            label="BUTTON_2"
+            label="BUTTON_2 ('X' button)"
             name="BUTTON_2"
             value="BUTTON_2"/>
         <combo_box.item
-            label="BUTTON_3"
+            label="BUTTON_3 ('Y' button)"
             name="BUTTON_3"
             value="BUTTON_3"/>
         <combo_box.item
-            label="BUTTON_4"
+            label="BUTTON_4 (Back button)"
             name="BUTTON_4"
             value="BUTTON_4"/>
         <combo_box.item
-            label="BUTTON_5"
+            label="BUTTON_5 (Guide button)"
             name="BUTTON_5"
             value="BUTTON_5"/>
         <combo_box.item
-            label="BUTTON_6"
+            label="BUTTON_6 (Home button)"
             name="BUTTON_6"
             value="BUTTON_6"/>
         <combo_box.item
-            label="BUTTON_7"
+            label="BUTTON_7 (Left stick)"
             name="BUTTON_7"
             value="BUTTON_7"/>
         <combo_box.item
-            label="BUTTON_8"
+            label="BUTTON_8 (Right stick)"
             name="BUTTON_8"
             value="BUTTON_8"/>
         <combo_box.item
-            label="BUTTON_9"
+            label="BUTTON_9 (Left shoulder)"
             name="BUTTON_9"
             value="BUTTON_9"/>
         <combo_box.item
-            label="BUTTON_10"
+            label="BUTTON_10 (Right shoulder)"
             name="BUTTON_10"
             value="BUTTON_10"/>
         <combo_box.item
-            label="BUTTON_11"
+            label="BUTTON_11 (DPad up)"
             name="BUTTON_11"
             value="BUTTON_11"/>
         <combo_box.item
-            label="BUTTON_12"
+            label="BUTTON_12 (DPad down)"
             name="BUTTON_12"
             value="BUTTON_12"/>
         <combo_box.item
-            label="BUTTON_13"
+            label="BUTTON_13 (DPad left)"
             name="BUTTON_13"
             value="BUTTON_13"/>
         <combo_box.item
-            label="BUTTON_14"
+            label="BUTTON_14 (DPad right)"
             name="BUTTON_14"
             value="BUTTON_14"/>
         <combo_box.item
-            label="BUTTON_15"
+            label="BUTTON_15 (Miscellaneous 1)"
             name="BUTTON_15"
             value="BUTTON_15"/>
         <combo_box.item
-            label="BUTTON_16"
+            label="BUTTON_16 (Paddle 1)"
             name="BUTTON_16"
             value="BUTTON_16"/>
         <combo_box.item
-            label="BUTTON_17"
+            label="BUTTON_17 (Paddle 2)"
             name="BUTTON_17"
             value="BUTTON_17"/>
         <combo_box.item
-            label="BUTTON_18"
+            label="BUTTON_18 (Paddle 3)"
             name="BUTTON_18"
             value="BUTTON_18"/>
         <combo_box.item
-            label="BUTTON_19"
+            label="BUTTON_19 (Paddle 4)"
             name="BUTTON_19"
             value="BUTTON_19"/>
         <combo_box.item
-            label="BUTTON_20"
+            label="BUTTON_20 (Touchpad)"
             name="BUTTON_20"
             value="BUTTON_20"/>
         <combo_box.item
@@ -237,7 +435,7 @@
             name="BUTTON_31"
             value="BUTTON_31"/>
         <combo_box.item
-            label="NONE"
+            label="NONE (No mapping)"
             name="NONE"
             value="NONE"/>
     </combo_box>
-- 
cgit v1.2.3


From 9c986bef6704ac07112e18dc82b870acf1847e41 Mon Sep 17 00:00:00 2001
From: leviathan <leviathan@lindenlab.com>
Date: Thu, 27 Jun 2024 00:18:42 -0700
Subject: put GameControl behind a feature flag

---
 indra/newview/skins/default/xui/en/menu_viewer.xml | 23 ++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 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 ec2dffb5e5..f6946f5304 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -19,7 +19,7 @@
          label="Inventory..."
          name="Inventory"
          shortcut="control|I"
-		     visible="true">
+         visible="true">
         <menu_item_check.on_check
          function="Floater.Visible"
          parameter="inventory" />
@@ -734,8 +734,7 @@
              function="Floater.Show"
              parameter="snapshot" />
         </menu_item_call>
-        
-<menu_item_call
+        <menu_item_call
          label="360 snapshot"
          name="Capture 360"
          shortcut="control|alt|shift|s">
@@ -2344,7 +2343,7 @@ function="World.EnvPreset"
                  function="Advanced.ToggleFeature"
                  parameter="flexible" />
             </menu_item_check>
-        </menu>        
+        </menu>
         <menu_item_check
          label="Use Plugin Read Thread"
          name="Use Plugin Read Thread">
@@ -2465,6 +2464,22 @@ 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">
-- 
cgit v1.2.3


From e90913c4a926a006467661bb0d2db0a4bdb7a4b9 Mon Sep 17 00:00:00 2001
From: leviathan <leviathan@lindenlab.com>
Date: Sat, 6 Jul 2024 08:43:19 -0700
Subject: add enable_game_control checkbox to GameControl prefs

---
 .../default/xui/en/panel_preferences_game_control.xml    | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

(limited to 'indra/newview/skins')

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 1815d98ae0..8c9e15a180 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
@@ -9,6 +9,14 @@
     name="gamecontrol"
     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"
@@ -16,7 +24,7 @@
         layout="topleft"
         height="15"
         left="10"
-        top="10"/>
+        top="30"/>
     <check_box
         name="game_control_to_agent"
         control_name="GameControlToAgent"
@@ -24,7 +32,7 @@
         layout="topleft"
         height="15"
         left="10"
-        top="30"/>
+        top="50"/>
     <check_box
         name="agent_to_game_control"
         control_name="AgentToGameControl"
@@ -32,12 +40,12 @@
         layout="topleft"
         height="15"
         left="10"
-        top="50"/>
+        top="70"/>
     <tab_container
         name="game_control_tabs"
         layout="topleft"
         follows="all"
-        top="70"
+        top="90"
         left="2"
         right="-2"
         bottom="-32">
-- 
cgit v1.2.3


From e74ce9655ed9f1124887aa31aa2e2155ea62d3da Mon Sep 17 00:00:00 2001
From: leviathan <leviathan@lindenlab.com>
Date: Wed, 10 Jul 2024 14:08:17 -0700
Subject: more correct AgentUpdate transmission logic

---
 .../skins/default/xui/en/floater_preferences.xml       | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_preferences.xml b/indra/newview/skins/default/xui/en/floater_preferences.xml
index e0dc538af4..e7fa839001 100644
--- a/indra/newview/skins/default/xui/en/floater_preferences.xml
+++ b/indra/newview/skins/default/xui/en/floater_preferences.xml
@@ -87,49 +87,49 @@
      top="40"
      width="658">
         <panel
-	 class="panel_preference"
+     class="panel_preference"
          filename="panel_preferences_general.xml"
          label="General"
          layout="topleft"
          help_topic="preferences_general_tab"
          name="general" />
         <panel
-	 class="panel_preference_graphics"
+     class="panel_preference_graphics"
          filename="panel_preferences_graphics1.xml"
          label="Graphics"
          layout="topleft"
          help_topic="preferences_display_tab"
          name="display" />
         <panel
-		 class="panel_preference"
+         class="panel_preference"
          filename="panel_preferences_sound.xml"
          label="Sound &amp; Media"
          layout="topleft"
          help_topic="preferences_audio_tab"
          name="audio" />
         <panel
-		 class="panel_preference"
+         class="panel_preference"
          filename="panel_preferences_chat.xml"
          label="Chat"
          layout="topleft"
          help_topic="preferences_chat_tab"
          name="chat" />
         <panel
-		 class="panel_preference"
+         class="panel_preference"
          filename="panel_preferences_move.xml"
          label="Move &amp; View"
          layout="topleft"
          help_topic="preferences_move_tab"
          name="move" />
         <panel
-		 class="panel_preference"
+         class="panel_preference"
          filename="panel_preferences_alerts.xml"
          label="Notifications"
          layout="topleft"
          help_topic="preferences_msgs_tab"
          name="msgs" />
         <panel
-		 class="panel_preference"
+         class="panel_preference"
          filename="panel_preferences_colors.xml"
          label="Colors"
          layout="topleft"
@@ -143,14 +143,14 @@
          help_topic="preferences_im_tab"
          name="im" />
         <panel
-		 class="panel_preference"
+         class="panel_preference"
          filename="panel_preferences_setup.xml"
          label="Setup"
          layout="topleft"
          help_topic="preferences_input_tab"
          name="input" />
         <panel
-		 class="panel_preference"
+         class="panel_preference"
          filename="panel_preferences_advanced.xml"
          label="Advanced"
          layout="topleft"
-- 
cgit v1.2.3


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


From f109f25a1ffbad8baa3177a8c7d861f1dabed387 Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Sat, 5 Oct 2024 15:25:48 +0200
Subject: Fix issues with game control preferences: * Add missing names for
 controls to make content localizable * Fix labels for controls that are
 obviously wrong/make no sense

---
 .../xui/en/game_control_table_camera_rows.xml       | 12 ++++++------
 .../default/xui/en/game_control_table_rows.xml      |  8 ++++----
 .../xui/en/panel_preferences_game_control.xml       | 21 ++++++++++++++-------
 3 files changed, 24 insertions(+), 17 deletions(-)

(limited to 'indra/newview/skins')

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 6074b72dc8..ef3d7ee4f7 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
@@ -22,7 +22,7 @@
          halign="left"
          name="action"
          tool_tip="Camera move forward/backward"
-         value="Advance Forward" />
+         value="Forward/Backward" />
     </rows>
     <rows
      name="pan"
@@ -33,7 +33,7 @@
          halign="left"
          name="action"
          tool_tip="Camera pan left/right"
-         value="Pan Left" />
+         value="Pan Left/Right" />
     </rows>
     <rows
      name="rise"
@@ -44,7 +44,7 @@
          halign="left"
          name="action"
          tool_tip="Camera rise/fall"
-         value="Rise Up" />
+         value="Rise Up/Down" />
     </rows>
     <rows
      name="pitch"
@@ -55,7 +55,7 @@
          halign="left"
          name="action"
          tool_tip="Camera adjust pitch"
-         value="Pitch Down" />
+         value="Pitch Up/Down" />
     </rows>
     <rows
      name="yaw"
@@ -66,7 +66,7 @@
          halign="left"
          name="action"
          tool_tip="Camera turn left/right"
-         value="Yaw CCW" />
+         value="Yaw CCW/CW" />
     </rows>
     <rows
      name="zoom"
@@ -77,7 +77,7 @@
          halign="left"
          name="action"
          tool_tip="Camera zoom in/out"
-         value="Zoom In" />
+         value="Zoom In/Out" />
     </rows>
     <!--
     <rows
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 181bc8592c..cd6f483782 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
@@ -21,7 +21,7 @@
          font="SansSerif"
          halign="left"
          name="action"
-         value="Walk Forward" />
+         value="Forward/Backward" />
     </rows>
     <rows
      name="slide"
@@ -31,7 +31,7 @@
          font="SansSerif"
          halign="left"
          name="action"
-         value="Strafe Left" />
+         value="Strafe" />
     </rows>
     <rows
      name="jump"
@@ -51,7 +51,7 @@
          font="SansSerif"
          halign="left"
          name="action"
-         value="Turn Left" />
+         value="Turn" />
     </rows>
     <rows
      name="look"
@@ -61,7 +61,7 @@
          font="SansSerif"
          halign="left"
          name="action"
-         value="Look Down" />
+         value="Look Up/Down" />
     </rows>
     <rows
      name="stop"
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 bd92fe895d..fb6cc8dc14 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
@@ -62,6 +62,7 @@
                     label="Action"
                     relative_width="0.25" />
                 <scroll_list.columns
+                    name="channel"
                     label="Channel"
                     relative_width="0.75" />
             </scroll_list>
@@ -81,6 +82,7 @@
                 right="-1"
                 bottom="-1">No device</text>
             <panel
+                name="device_selection_panel"
                 layout="topleft"
                 follows="top|left|right"
                 top="1"
@@ -156,15 +158,19 @@
                             selection_type="header"
                             fg_disable_color="ScrollUnselectedColor">
                             <scroll_list.columns
+                                name="axis"
                                 label="Axis"
                                 relative_width="0.5"/>
                             <scroll_list.columns
+                                name="invert"
                                 label="Invert"
                                 relative_width="0.1"/>
                             <scroll_list.columns
+                                name="dead_zone"
                                 label="Dead Zone"
                                 relative_width="0.2"/>
                             <scroll_list.columns
+                                name="offset"
                                 label="Offset"
                                 relative_width="0.2"/>
                         </scroll_list>
@@ -212,6 +218,7 @@
         </panel>
     </tab_container>
     <panel
+        name="reset_to_defaults_panel"
         layout="topleft"
         follows="top|left"
         top="405"
@@ -237,13 +244,13 @@
         name="axis_selector"
         width="250"
         height="18">
-        <combo_box.item label="AXIS_0 (Left stick: tilt left/right)"/>
-        <combo_box.item label="AXIS_1 (Left stick: tilt forward/back)"/>
-        <combo_box.item label="AXIS_2 (Right stick: tilt left/right)"/>
-        <combo_box.item label="AXIS_3 (Right stick: tilt forward/back)"/>
-        <combo_box.item label="AXIS_4 (Left trigger: push/release)"/>
-        <combo_box.item label="AXIS_5 (Right trigger: push/release)"/>
-        <combo_box.item label="NONE (No mapping)"/>
+        <combo_box.item name="axis_0" label="AXIS_0 (Left stick: tilt left/right)"/>
+        <combo_box.item name="axis_1" label="AXIS_1 (Left stick: tilt forward/back)"/>
+        <combo_box.item name="axis_2" label="AXIS_2 (Right stick: tilt left/right)"/>
+        <combo_box.item name="axis_3" label="AXIS_3 (Right stick: tilt forward/back)"/>
+        <combo_box.item name="axis_4" label="AXIS_4 (Left trigger: push/release)"/>
+        <combo_box.item name="axis_5" label="AXIS_5 (Right trigger: push/release)"/>
+        <combo_box.item name="axis_none" label="NONE (No mapping)"/>
     </combo_box>
     <combo_box
         name="analog_channel_selector"
-- 
cgit v1.2.3


From 636aaf172d6b0e1eba8ad2d49a0778f6f0235d04 Mon Sep 17 00:00:00 2001
From: leviathan <leviathan@lindenlab.com>
Date: Mon, 7 Oct 2024 12:18:25 -0700
Subject: restore old JoystickAxis name convention

---
 .../skins/default/xui/en/floater_joystick.xml      | 88 +++++++++++-----------
 1 file changed, 44 insertions(+), 44 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_joystick.xml b/indra/newview/skins/default/xui/en/floater_joystick.xml
index 597744238c..623f282305 100644
--- a/indra/newview/skins/default/xui/en/floater_joystick.xml
+++ b/indra/newview/skins/default/xui/en/floater_joystick.xml
@@ -35,7 +35,7 @@
     <spinner
      bottom="56"
      height="10"
-     control_name="Axis1"
+     control_name="JoystickAxis1"
      decimal_digits="0"
      increment="1"
      label="X Axis Mapping"
@@ -44,12 +44,12 @@
      left="20"
      max_val="5"
      min_val="-1"
-     name="Axis1"
+     name="JoystickAxis1"
      width="140" />
     <spinner
      bottom_delta="0"
-     height="10"     
-     control_name="Axis2"
+     height="10"
+     control_name="JoystickAxis2"
      decimal_digits="0"
      increment="1"
      label="Y Axis Mapping"
@@ -58,12 +58,12 @@
      left="190"
      max_val="5"
      min_val="-1"
-     name="Axis2"
+     name="JoystickAxis2"
      width="140" />
     <spinner
      bottom_delta="0"
-     height="10"     
-     control_name="Axis0"
+     height="10"
+     control_name="JoystickAxis0"
      decimal_digits="0"
      increment="1"
      label="Z Axis Mapping"
@@ -72,12 +72,12 @@
      left="360"
      max_val="5"
      min_val="-1"
-     name="Axis0"
+     name="JoystickAxis0"
      width="140" />
     <spinner
      bottom="76"
-     height="10"     
-     control_name="Axis4"
+     height="10"
+     control_name="JoystickAxis4"
      decimal_digits="0"
      increment="1"
      label="Pitch Mapping"
@@ -86,12 +86,12 @@
      left="20"
      max_val="5"
      min_val="-1"
-     name="Axis4"
+     name="JoystickAxis4"
      width="140" />
     <spinner
      bottom_delta="0"
-     height="10"     
-     control_name="Axis5"
+     height="10"
+     control_name="JoystickAxis5"
      decimal_digits="0"
      increment="1"
      label="Yaw Mapping"
@@ -100,12 +100,12 @@
      left="190"
      max_val="5"
      min_val="-1"
-     name="Axis5"
+     name="JoystickAxis5"
      width="140" />
     <spinner
      bottom_delta="0"
-     height="10"     
-     control_name="Axis3"
+     height="10"
+     control_name="JoystickAxis3"
      decimal_digits="0"
      increment="1"
      label="Roll Mapping"
@@ -114,12 +114,12 @@
      left="360"
      max_val="5"
      min_val="-1"
-     name="Axis3"
+     name="JoystickAxis3"
      width="140" />
     <spinner
      bottom="96"
-     height="10"     
-     control_name="Axis6"
+     height="10"
+     control_name="JoystickAxis6"
      decimal_digits="0"
      increment="1"
      label="Zoom Mapping"
@@ -128,7 +128,7 @@
      left="20"
      max_val="5"
      min_val="-1"
-     name="Axis6"
+     name="JoystickAxis6"
      width="140" />
     <check_box
      bottom_delta="18"
@@ -141,7 +141,7 @@
      width="60" />
     <check_box
      bottom_delta="0"
-     height="10"     
+     height="10"
      control_name="Cursor3D"
      label="3D Cursor"
      layout="topleft"
@@ -150,7 +150,7 @@
      width="60" />
     <check_box
      bottom_delta="0"
-     height="10"     
+     height="10"
      control_name="AutoLeveling"
      label="Auto Level"
      layout="topleft"
@@ -173,7 +173,7 @@
     </text>
     <check_box
      bottom="134"
-     height="10"     
+     height="10"
      control_name="JoystickAvatarEnabled"
      halign="center"
      label="Avatar"
@@ -183,7 +183,7 @@
      width="60" />
     <check_box
      bottom_delta="0"
-     height="10"     
+     height="10"
      control_name="JoystickBuildEnabled"
      halign="center"
      label="Build"
@@ -193,7 +193,7 @@
      width="60" />
     <check_box
      bottom_delta="0"
-     height="10"     
+     height="10"
      control_name="JoystickFlycamEnabled"
      halign="center"
      label="Flycam"
@@ -213,7 +213,7 @@
         <stat_bar
          bar_max="2"
          bar_min="-2"
-				 show_bar="true"
+         show_bar="true"
          label="Axis 0"
          label_spacing="1"
          layout="topleft"
@@ -225,7 +225,7 @@
         <stat_bar
          bar_max="2"
          bar_min="-2"
-				 show_bar="true"
+         show_bar="true"
          label="Axis 1"
          label_spacing="1"
          layout="topleft"
@@ -234,7 +234,7 @@
         <stat_bar
          bar_max="2"
          bar_min="-2"
-				 show_bar="true"
+         show_bar="true"
          label="Axis 2"
          label_spacing="1"
          layout="topleft"
@@ -243,7 +243,7 @@
         <stat_bar
          bar_max="2"
          bar_min="-2"
-				 show_bar="true"
+         show_bar="true"
          label="Axis 3"
          label_spacing="1"
          layout="topleft"
@@ -252,7 +252,7 @@
         <stat_bar
          bar_max="2"
          bar_min="-2"
-				 show_bar="true"
+         show_bar="true"
          label="Axis 4"
          label_spacing="1"
          layout="topleft"
@@ -262,7 +262,7 @@
          bar_max="2"
          bar_min="-2"
          label="Axis 5"
-				 show_bar="true"				 
+         show_bar="true"
          label_spacing="1"
          layout="topleft"
          name="axis5"
@@ -281,7 +281,7 @@
     </text>
     <spinner
      bottom_delta="0"
-     height="10"     
+     height="10"
      control_name="AvatarAxisScale1"
      decimal_digits="2"
      label_width="0"
@@ -293,7 +293,7 @@
      width="56" />
     <spinner
      bottom_delta="0"
-     height="10"     
+     height="10"
      control_name="BuildAxisScale1"
      decimal_digits="2"
      label_width="0"
@@ -305,7 +305,7 @@
      width="56" />
     <spinner
      bottom_delta="0"
-     height="10"     
+     height="10"
      control_name="FlycamAxisScale1"
      decimal_digits="2"
      label_width="0"
@@ -328,7 +328,7 @@
     </text>
     <spinner
      bottom_delta="0"
-     height="10"     
+     height="10"
      control_name="AvatarAxisScale2"
      decimal_digits="2"
      label_width="0"
@@ -340,7 +340,7 @@
      width="56" />
     <spinner
      bottom_delta="0"
-     height="10"     
+     height="10"
      control_name="BuildAxisScale2"
      decimal_digits="2"
      label_width="0"
@@ -352,7 +352,7 @@
      width="56" />
     <spinner
      bottom_delta="0"
-     height="10"     
+     height="10"
      control_name="FlycamAxisScale2"
      decimal_digits="2"
      label_width="0"
@@ -375,7 +375,7 @@
     </text>
     <spinner
      bottom_delta="0"
-     height="10"     
+     height="10"
      control_name="AvatarAxisScale0"
      decimal_digits="2"
      label_width="0"
@@ -387,7 +387,7 @@
      width="56" />
     <spinner
      bottom_delta="0"
-     height="10"     
+     height="10"
      control_name="BuildAxisScale0"
      decimal_digits="2"
      label_width="0"
@@ -399,7 +399,7 @@
      width="56" />
     <spinner
      bottom_delta="0"
-     height="10"     
+     height="10"
      control_name="FlycamAxisScale0"
      decimal_digits="2"
      label_width="0"
@@ -422,7 +422,7 @@
     </text>
     <spinner
      bottom_delta="0"
-     height="10"     
+     height="10"
      control_name="AvatarAxisScale4"
      decimal_digits="2"
      label_width="0"
@@ -434,7 +434,7 @@
      width="56" />
     <spinner
      bottom_delta="0"
-     height="10"     
+     height="10"
      control_name="BuildAxisScale4"
      decimal_digits="2"
      label_width="0"
@@ -446,7 +446,7 @@
      width="56" />
     <spinner
      bottom_delta="0"
-     height="10"     
+     height="10"
      control_name="FlycamAxisScale4"
      decimal_digits="2"
      label_width="0"
@@ -595,7 +595,7 @@
     </text>
     <spinner
      bottom_delta="0"
-     height="10"     
+     height="10"
      control_name="AvatarAxisDeadZone2"
      decimal_digits="2"
      increment="0.01"
-- 
cgit v1.2.3