SL-6109 Removed obsolete control, moved table init to xml, cleanup

4 files changed, 572 insertions, 345 deletions

diff --git a/indra/newview/skins/default/xui/en/control_table_contents.xml b/indra/newview/skins/default/xui/en/control_table_contents.xml
new file mode 100644
index 0000000000..00c2d27124
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/control_table_contents.xml
@@ -0,0 +1,569 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

+<contents>

+    <columns

+     relative_width="0.34"

+     label="Action"

+     name="lst_action" />

+    <columns

+     relative_width="0.22"

+     label="Prymary Control"

+     name="lst_ctrl1" />

+    <columns

+     relative_width="0.22"

+     label="Alternate 1"

+     name="lst_ctrl2" />

+    <columns

+     relative_width="0.22"

+     label="Alternate 2"

+     name="lst_ctrl3" />

+    <rows

+     enabled="false"

+     value="">

+        <columns

+         cell_type="icontext"

+         column="lst_action"

+         font="SansSerif"

+         halign="left"

+         label="Move Actions"

+         name="lst_action"

+         value="Move_Walk_Off" />

+    </rows>

+    <rows

+     value="walk_to">

+        <columns

+         column="lst_action"

+         font="SansSerif"

+         halign="left"

+         name="lst_action"

+         tool_tip="Walk to location mouse cursor points to"

+         value="Walk to" />

+    </rows>

+    <rows

+     value="teleport_to">

+        <columns

+         column="lst_action"

+         font="SansSerif"

+         halign="left"

+         name="lst_action"

+         tool_tip="Teleport to location mouse cursor points to, but not all locations allow direct teleportation so you might be teleported closer to destination instead"

+         value="Teleport to" />

+    </rows>

+    <rows

+     value="push_forward">

+        <columns

+         column="lst_action"

+         font="SansSerif"

+         halign="left"

+         name="lst_action"

+         value="Move Forward" />

+    </rows>

+    <rows

+     value="push_backward">

+        <columns

+         column="lst_action"

+         font="SansSerif"

+         halign="left"

+         name="lst_action"

+         value="Move Backward" />

+    </rows>

+    <rows

+     value="turn_left">

+        <columns

+         column="lst_action"

+         font="SansSerif"

+         halign="left"

+         name="lst_action"

+         value="Left" />

+    </rows>

+    <rows

+     value="turn_right">

+        <columns

+         column="lst_action"

+         font="SansSerif"

+         halign="left"

+         name="lst_action"

+         value="Right" />

+    </rows>

+    <rows

+     value="slide_left">

+        <columns

+         column="lst_action"

+         font="SansSerif"

+         halign="left"

+         name="lst_action"

+         value="Strafe left" />

+    </rows>

+    <rows

+     value="slide_right">

+        <columns

+         column="lst_action"

+         font="SansSerif"

+         halign="left"

+         name="lst_action"

+         value="Strafe right" />

+    </rows>

+    <rows

+     value="jump">

+        <columns

+         column="lst_action"

+         font="SansSerif"

+         halign="left"

+         name="lst_action"

+         value="Jump/Up" />

+    </rows>

+    <rows

+     value="push_down">

+        <columns

+         column="lst_action"

+         font="SansSerif"

+         halign="left"

+         name="lst_action"

+         value="Down" />

+    </rows>

+    <rows

+     value="run_forward">

+        <columns

+         column="lst_action"

+         font="SansSerif"

+         halign="left"

+         name="lst_action"

+         value="Run Forward" />

+    </rows>

+    <rows

+     value="run_backward">

+        <columns

+         column="lst_action"

+         font="SansSerif"

+         halign="left"

+         name="lst_action"

+         value="Run Backward" />

+    </rows>

+    <rows

+     value="run_left">

+        <columns

+         column="lst_action"

+         font="SansSerif"

+         halign="left"

+         name="lst_action"

+         value="Run Left" />

+    </rows>

+    <rows

+     value="run_right">

+        <columns

+         column="lst_action"

+         font="SansSerif"

+         halign="left"

+         name="lst_action"

+         value="Run Right" />

+    </rows>

+    <rows

+     value="toggle_run">

+        <columns

+         column="lst_action"

+         font="SansSerif"

+         halign="left"

+         name="lst_action"

+         value="Toggle Run" />

+    </rows>

+    <rows

+     value="toggle_fly">

+        <columns

+         column="lst_action"

+         font="SansSerif"

+         halign="left"

+         name="lst_action"

+         value="Fly/Stop flying" />

+    </rows>

+    <rows

+     value="toggle_sit">

+        <columns

+         column="lst_action"

+         font="SansSerif"

+         halign="left"

+         name="lst_action"

+         value="Sit/Stand" />

+    </rows>

+    <rows

+     value="stop_moving">

+        <columns

+         column="lst_action"

+         font="SansSerif"

+         halign="left"

+         name="lst_action"

+         value="Stop Moving" />

+    </rows>

+    <rows

+     enabled="false">

+        <columns

+         cell_type="icon"

+         color="0 0 0 0.7"

+         halign="center"

+         value="menu_separator" />

+    </rows>

+    <rows

+     enabled="false"

+     value="">

+        <columns

+         cell_type="icontext"

+         column="lst_action"

+         font="SansSerif"

+         halign="left"

+         label="Camera"

+         name="lst_action"

+         value="Cam_FreeCam_Off" />

+    </rows>

+    <rows

+     value="look_up">

+        <columns

+         column="lst_action"

+         font="SansSerif"

+         halign="left"

+         name="lst_action"

+         value="Look Up" />

+    </rows>

+    <rows

+     value="look_down">

+        <columns

+         column="lst_action"

+         font="SansSerif"

+         halign="left"

+         name="lst_action"

+         value="Look Down" />

+    </rows>

+    <rows

+     value="move_forward">

+        <columns

+         column="lst_action"

+         font="SansSerif"

+         halign="left"

+         name="lst_action"

+         value="Camera Forward" />

+    </rows>

+    <rows

+     value="move_backward">

+        <columns

+         column="lst_action"

+         font="SansSerif"

+         halign="left"

+         name="lst_action"

+         value="Camera Backward" />

+    </rows>

+    <rows

+     value="move_forward_fast">

+        <columns

+         column="lst_action"

+         font="SansSerif"

+         halign="left"

+         name="lst_action"

+         value="Camera Forward Fast" />

+    </rows>

+    <rows

+     value="move_backward_fast">

+        <columns

+         column="lst_action"

+         font="SansSerif"

+         halign="left"

+         name="lst_action"

+         value="Camera Backward Fast" />

+    </rows>

+    <rows

+     value="move_forward_sitting">

+        <columns

+         column="lst_action"

+         font="SansSerif"

+         halign="left"

+         name="lst_action"

+         value="Camera Forward Sitting" />

+    </rows>

+    <rows

+     value="move_backward_sitting">

+        <columns

+         column="lst_action"

+         font="SansSerif"

+         halign="left"

+         name="lst_action"

+         value="Camera Backward Sitting" />

+    </rows>

+    <rows

+     value="spin_over">

+        <columns

+         column="lst_action"

+         font="SansSerif"

+         halign="left"

+         name="lst_action"

+         value="Camera Spin Over" />

+    </rows>

+    <rows

+     value="spin_under">

+        <columns

+         column="lst_action"

+         font="SansSerif"

+         halign="left"

+         name="lst_action"

+         value="Camera Spin Under" />

+    </rows>

+    <rows

+     value="spin_over_sitting">

+        <columns

+         column="lst_action"

+         font="SansSerif"

+         halign="left"

+         name="lst_action"

+         value="Camera Spin Over" />

+    </rows>

+    <rows

+     value="spin_under_sitting">

+        <columns

+         column="lst_action"

+         font="SansSerif"

+         halign="left"

+         name="lst_action"

+         value="Camera Spin Under" />

+    </rows>

+    <rows

+     value="pan_up">

+        <columns

+         column="lst_action"

+         font="SansSerif"

+         halign="left"

+         name="lst_action"

+         value="Camera Pan Up" />

+    </rows>

+    <rows

+     value="pan_down">

+        <columns

+         column="lst_action"

+         font="SansSerif"

+         halign="left"

+         name="lst_action"

+         value="Camera Pan Down" />

+    </rows>

+    <rows

+     value="pan_left">

+        <columns

+         column="lst_action"

+         font="SansSerif"

+         halign="left"

+         name="lst_action"

+         value="Camera Pan Left" />

+    </rows>

+    <rows

+     value="pan_right">

+        <columns

+         column="lst_action"

+         font="SansSerif"

+         halign="left"

+         name="lst_action"

+         value="Camera Pan Right" />

+    </rows>

+    <rows

+     value="pan_in">

+        <columns

+         column="lst_action"

+         font="SansSerif"

+         halign="left"

+         name="lst_action"

+         value="Camera Pan In" />

+    </rows>

+    <rows

+     value="pan_out">

+        <columns

+         column="lst_action"

+         font="SansSerif"

+         halign="left"

+         name="lst_action"

+         value="Camera Pan Out" />

+    </rows>

+    <rows

+     value="spin_around_ccw">

+        <columns

+         column="lst_action"

+         font="SansSerif"

+         halign="left"

+         name="lst_action"

+         tool_tip="Camera spin around counterclockwise"

+         value="Counterclockwise" />

+    </rows>

+    <rows

+     value="spin_around_cw">

+        <columns

+         column="lst_action"

+         font="SansSerif"

+         halign="left"

+         name="lst_action"

+         tool_tip="Camera spin around clockwise"

+         value="Clockwise" />

+    </rows>

+    <rows

+     value="spin_around_ccw_sitting">

+        <columns

+         column="lst_action"

+         font="SansSerif"

+         halign="left"

+         name="lst_action"

+         tool_tip="Camera spin around counterclockwise sitting"

+         value="Counterclockwise Sitting" />

+    </rows>

+    <rows

+     value="spin_around_cw_sitting">

+        <columns

+         column="lst_action"

+         font="SansSerif"

+         halign="left"

+         name="lst_action"

+         tool_tip="Camera spin around clockwise sitting"

+         value="Clockwise Sitting" />

+    </rows>

+    <rows

+     enabled="false">

+        <columns

+         cell_type="icon"

+         color="0 0 0 0.7"

+         halign="center"

+         value="menu_separator" />

+    </rows>

+    <rows

+     enabled="false"

+     value="">

+        <columns

+         cell_type="icontext"

+         column="lst_action"

+         font="SansSerif"

+         halign="left"

+         label="Editing"

+         name="lst_action"

+         value="Tool_Dozer" />

+    </rows>

+    <rows

+     value="edit_avatar_spin_ccw">

+        <columns

+         column="lst_action"

+         font="SansSerif"

+         halign="left"

+         name="lst_action"

+         tool_tip="Camera spin around avatar counterclockwise"

+         value="Counterclockwise" />

+    </rows>

+    <rows

+     value="edit_avatar_spin_cw">

+        <columns

+         column="lst_action"

+         font="SansSerif"

+         halign="left"

+         name="lst_action"

+         tool_tip="Camera spin around avatar clockwise"

+         value="Clockwise" />

+    </rows>

+    <rows

+     value="edit_avatar_spin_over">

+        <columns

+         column="lst_action"

+         font="SansSerif"

+         halign="left"

+         name="lst_action"

+         tool_tip="Camera spin over avatar"

+         value="Camera Spin Over" />

+    </rows>

+    <rows

+     value="edit_avatar_spin_under">

+        <columns

+         column="lst_action"

+         font="SansSerif"

+         halign="left"

+         name="lst_action"

+         tool_tip="Camera spin under avatar"

+         value="Camera Spin Under" />

+    </rows>

+    <rows

+     value="edit_avatar_move_forward">

+        <columns

+         column="lst_action"

+         font="SansSerif"

+         halign="left"

+         name="lst_action"

+         value="Camera Forward" />

+    </rows>

+    <rows

+     value="edit_avatar_move_backward">

+        <columns

+         column="lst_action"

+         font="SansSerif"

+         halign="left"

+         name="lst_action"

+         value="Camera Backward" />

+    </rows>

+    <rows

+     enabled="false">

+        <columns

+         cell_type="icon"

+         color="0 0 0 0.7"

+         halign="center"

+         value="menu_separator" />

+    </rows>

+    <rows

+     enabled="false"

+     value="">

+        <columns

+         cell_type="icontext"

+         column="lst_action"

+         font="SansSerif"

+         halign="left"

+         label="Sound and Media"

+         name="lst_action"

+         value="Audio_Press" />

+    </rows>

+    <rows

+     value="toggle_pause_media">

+        <columns

+         column="lst_action"

+         font="SansSerif"

+         halign="left"

+         name="lst_action"

+         value="Play/Pause Media" />

+    </rows>

+    <rows

+     value="toggle_enable_media">

+        <columns

+         column="lst_action"

+         font="SansSerif"

+         halign="left"

+         name="lst_action"

+         value="Play/Stop All Media" />

+    </rows>

+    <rows

+     value="voice_follow_key">

+        <columns

+         column="lst_action"

+         font="SansSerif"

+         halign="left"

+         name="lst_action"

+         value="Voice" />

+    </rows>

+    <rows

+     value="toggle_voice">

+        <columns

+         column="lst_action"

+         font="SansSerif"

+         halign="left"

+         name="lst_action"

+         value="Toggle Voice" />

+    </rows>

+    <rows

+     value="start_chat">

+        <columns

+         column="lst_action"

+         font="SansSerif"

+         halign="left"

+         name="lst_action"

+         value="Start Chat" />

+    </rows>

+    <rows

+     value="start_gesture">

+        <columns

+         column="lst_action"

+         font="SansSerif"

+         halign="left"

+         name="lst_action"

+         value="Start Gesture" />

+    </rows>

+</contents>

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 b7b5280825..eca3c550d5 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_controls.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_controls.xml
@@ -9,244 +9,6 @@
  name="controls"
  top="1"
  width="517">
-  <panel.string
-   name="walk_to">
-    Walk to
-  </panel.string>
-  <panel.string
-   name="control_view_actions">
-    View Actions
-  </panel.string>
-  <panel.string
-   name="control_about">
-    About/Profile
-  </panel.string>
-  <panel.string
-   name="control_orbit">
-    Orbit
-  </panel.string>
-  <panel.string
-   name="control_pan">
-    Pan
-  </panel.string>
-  <panel.string
-   name="control_world_map">
-    World Map
-  </panel.string>
-  <panel.string
-   name="control_zoom">
-    Zoom
-  </panel.string>
-  <panel.string
-   name="control_interactions">
-    Interactions
-  </panel.string>
-  <panel.string
-   name="control_build">
-    Build
-  </panel.string>
-  <panel.string
-   name="control_drag">
-    Drag
-  </panel.string>
-  <panel.string
-   name="control_edit">
-    Edit
-  </panel.string>
-  <panel.string
-   name="control_menu">
-    Menu
-  </panel.string>
-  <panel.string
-   name="control_open">
-    Open
-  </panel.string>
-  <panel.string
-   name="control_touch">
-    Touch
-  </panel.string>
-  <panel.string
-   name="control_wear">
-    Wear
-  </panel.string>
-  <panel.string
-   name="control_movements">
-    Move Actions
-  </panel.string>
-  <panel.string
-   name="teleport_to">
-    Teleport to
-  </panel.string>
-  <panel.string
-   name="toggle_sit">
-    Sit/Stand
-  </panel.string>
-  <panel.string
-   name="control_teleportto">
-    Teleport To
-  </panel.string>
-  <panel.string
-   name="push_forward">
-    Move Forward
-  </panel.string>
-  <panel.string
-   name="push_backward">
-    Move Backward
-  </panel.string>
-  <panel.string
-   name="turn_left">
-    Left
-  </panel.string>
-  <panel.string
-   name="turn_right">
-    Right
-  </panel.string>
-  <!--(check with move floater)-->
-  <panel.string
-   name="slide_left">
-    Strafe left
-  </panel.string>
-  <panel.string
-   name="slide_right">
-    Strafe right
-  </panel.string>
-  <panel.string
-   name="jump">
-    Jump/Up
-  </panel.string>
-  <panel.string
-   name="push_down">
-    Down
-  </panel.string>
-  <panel.string
-   name="control_run">
-    Run
-  </panel.string>
-  <panel.string
-   name="run_forward">
-    Run Forward
-  </panel.string>
-  <panel.string
-   name="run_backward">
-    Run Backward
-  </panel.string>
-  <panel.string
-   name="run_left">
-    Run Left
-  </panel.string>
-  <panel.string
-   name="run_right">
-    Run Right
-  </panel.string>
-  <panel.string
-   name="toggle_run">
-    Toggle Run
-  </panel.string>
-  <panel.string
-   name="toggle_fly">
-    Fly/Stop flying
-  </panel.string>
-  <panel.string
-   name="stop_moving">
-    Stop Moving
-  </panel.string>
-  <panel.string
-   name="control_camera">
-    Camera
-  </panel.string>
-  <panel.string
-   name="look_up">
-    Look Up
-  </panel.string>
-  <panel.string
-   name="look_down">
-    Look Down
-  </panel.string>
-  <panel.string
-   name="move_forward">
-    Camera Forward
-  </panel.string>
-  <panel.string
-   name="move_backward">
-    Camera Backward
-  </panel.string>
-  <panel.string
-   name="move_forward_fast">
-    Camera Forward Fast
-  </panel.string>
-  <panel.string
-   name="move_backward_fast">
-    Camera Backward Fast
-  </panel.string>
-  <panel.string
-   name="move_forward_sitting">
-    Camera Forward Sitting
-  </panel.string>
-  <panel.string
-   name="move_backward_sitting">
-    Camera Backward Sitting
-  </panel.string>
-  <panel.string
-   name="spin_over">
-    Camera Spin Over
-  </panel.string>
-  <panel.string
-   name="spin_under">
-    Camera Spin Under
-  </panel.string>
-  <panel.string
-   name="spin_over_sitting">
-    Camera Spin Over
-  </panel.string>
-  <panel.string
-   name="spin_under_sitting">
-    Camera Spin Under
-  </panel.string>
-  <panel.string
-   name="pan_up">
-    Camera Pan Up
-  </panel.string>
-  <panel.string
-   name="pan_down">
-    Camera Pan Down
-  </panel.string>
-  <panel.string
-   name="pan_left">
-    Camera Pan Left
-  </panel.string>
-  <panel.string
-   name="pan_right">
-    Camera Pan Right
-  </panel.string>
-  <panel.string
-   name="pan_left">
-    Camera Pan In
-  </panel.string>
-  <panel.string
-   name="pan_right">
-    Camera Pan Out
-  </panel.string>
-  <panel.string
-   name="control_mediacontent">
-    Sound and Media
-  </panel.string>
-  <panel.string
-   name="toggle_pause_media">
-    Play/Pause Media
-  </panel.string>
-  <panel.string
-   name="toggle_enable_media">
-    Play/Stop All Media
-  </panel.string>
-  <panel.string
-   name="voice_follow_key">
-    Voice
-  </panel.string>
-  <panel.string
-   name="toggle_voice">
-    Toggle Voice
-  </panel.string>
-
   <combo_box
    follows="top|left"
    layout="topleft"
@@ -299,22 +61,6 @@
    right="-3"
    can_sort="false"
    multi_select="false"
-   name="controls_list">
-    <scroll_list.columns
-     relative_width="0.34"
-     label="Action"
-     name="lst_action" />
-    <scroll_list.columns
-     relative_width="0.22"
-     label="Control Method 1"
-     name="lst_ctrl1" />
-    <scroll_list.columns
-     relative_width="0.22"
-     label="Control Method 2"
-     name="lst_ctrl2" />
-    <scroll_list.columns
-     relative_width="0.22"
-     label="Control Method 3"
-     name="lst_ctrl3" />
-  </scroll_list>
+   name="controls_list"
+   fg_disable_color="ScrollUnselectedColor"/>
 </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 8794e3bf95..d106456b31 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_move.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_move.xml
@@ -195,70 +195,6 @@
    name="invert_mouse"
    top_delta="0"
    width="128" />
-  <text
-   follows="left|top"
-   type="string"
-   length="1"
-   height="10"
-   layout="topleft"
-   left="86"
-   name="single_click_action_lbl"
-   width="150"
-   top_pad="20">
-    Single click on land:
-  </text>
-  <combo_box
-   height="23"
-   layout="topleft"
-   left_pad="10"
-   top_delta="-6"
-   name="single_click_action_combo"
-   width="200">
-    <combo_box.item
-     label="No action"
-     name="0"
-     value="0"/>
-    <combo_box.item
-     label="Move to clicked point"
-     name="1"
-     value="1"/>
-    <combo_box.commit_callback
-     function="Pref.ClickActionChange"/>
-  </combo_box>
-  <text
-   follows="left|top"
-   type="string"
-   length="1"
-   height="10"
-   layout="topleft"
-   left="86"
-   name="double_click_action_lbl"
-   width="150"
-   top_pad="12">
-    Double click on land:
-  </text>
-  <combo_box
-   height="23"
-   layout="topleft"
-   left_pad="10"
-   top_delta="-6"
-   name="double_click_action_combo"
-   width="200">
-    <combo_box.item
-     label="No action"
-     name="0"
-     value="0"/>
-    <combo_box.item
-     label="Move to clicked point"
-     name="1"
-     value="1"/>
-    <combo_box.item
-     label="Teleport to clicked point"
-     name="2"
-     value="2"/>
-    <combo_box.commit_callback
-     function="Pref.ClickActionChange"/>
-  </combo_box>
   <button
    height="23"
    label="Other Devices"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
index c2defdd772..db88798d6b 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
@@ -463,37 +463,13 @@
   enabled_control="EnableVoiceChat"
   control_name="PushToTalkToggle"
   height="15"
-  label="Toggle speak on/off when I press:"
+  label="Toggle speak on/off when I press button in toolbar"
   layout="topleft"
   left="44"
   name="push_to_talk_toggle_check"
   width="237"
   tool_tip="When in toggle mode, press and release the trigger key ONCE to switch your microphone on or off. When not in toggle mode, the microphone broadcasts your voice only while the trigger is being held down."
   top_pad="3"/>
-  <line_editor
-   follows="top|left"
-   control_name="PushToTalkButton"
-   enabled="false"
-   enabled_control="EnableVoiceChat"
-   height="23"
-   left="80"
-   max_length_bytes="200"
-   name="modifier_combo"
-   label="Push-to-Speak trigger"
-   top_pad="3"
-   width="200" />
-  <button
-   layout="topleft"
-   follows="top|left"
-   enabled_control="EnableVoiceChat"
-   height="23"
-   label="Set Key"
-   left_pad="5"
-   name="set_voice_hotkey_button"
-   width="100">
-    <button.commit_callback
-    function="Pref.VoiceSetKey" />
-  </button>
   <button
      enabled_control="EnableVoiceChat"
      follows="top|left"