Merge pull request #2817 from Ansariel/develop-gamecontrol-prefs

Fix issues with game control preferences

3 files changed, 24 insertions, 17 deletions

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"