Reverted SL-6109 keybinding changes

Changes were moved to DRTVWR-514

12 files changed, 49 insertions, 763 deletions

diff --git a/indra/newview/skins/default/xui/en/control_table_contents_camera.xml b/indra/newview/skins/default/xui/en/control_table_contents_camera.xml
deleted file mode 100644
index aba81e3134..0000000000
--- a/indra/newview/skins/default/xui/en/control_table_contents_camera.xml
+++ /dev/null
@@ -1,178 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<contents>
-    <rows
-     enabled="false"
-     name="camera_actions"
-     value="">
-        <columns
-         type="icontext"
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         label="Camera"
-         name="lst_action"
-         value="Cam_FreeCam_Off" />
-    </rows>
-    <rows
-     name="look_up"
-     value="look_up">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Look Up" />
-    </rows>
-    <rows
-     name="look_down"
-     value="look_down">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Look Down" />
-    </rows>
-    <rows
-     name="move_forward"
-     value="move_forward">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Camera Forward" />
-    </rows>
-    <rows
-     name="move_backward"
-     value="move_backward">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Camera Backward" />
-    </rows>
-    <rows
-     name="move_forward_fast"
-     value="move_forward_fast">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Camera Forward Fast" />
-    </rows>
-    <rows
-     name="move_backward_fast"
-     value="move_backward_fast">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Camera Backward Fast" />
-    </rows>
-    <rows
-     name="spin_over"
-     value="spin_over">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Camera Spin Over" />
-    </rows>
-    <rows
-     name="spin_under"
-     value="spin_under">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Camera Spin Under" />
-    </rows>
-    <rows
-     name="pan_up"
-     value="pan_up">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Camera Pan Up" />
-    </rows>
-    <rows
-     name="pan_down"
-     value="pan_down">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Camera Pan Down" />
-    </rows>
-    <rows
-     name="pan_left"
-     value="pan_left">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Camera Pan Left" />
-    </rows>
-    <rows
-     name="pan_right"
-     value="pan_right">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Camera Pan Right" />
-    </rows>
-    <rows
-     name="pan_in"
-     value="pan_in">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Camera Pan In" />
-    </rows>
-    <rows
-     name="pan_out"
-     value="pan_out">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Camera Pan Out" />
-    </rows>
-    <rows
-     name="spin_around_ccw"
-     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
-     name="spin_around_cw"
-     value="spin_around_cw">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         tool_tip="Camera spin around clockwise"
-         value="Clockwise" />
-    </rows>
-</contents>
diff --git a/indra/newview/skins/default/xui/en/control_table_contents_camera_sitting.xml b/indra/newview/skins/default/xui/en/control_table_contents_camera_sitting.xml
deleted file mode 100644
index 9334c6e179..0000000000
--- a/indra/newview/skins/default/xui/en/control_table_contents_camera_sitting.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<contents>
-    <rows
-     name="move_forward_sitting"
-     value="move_forward_sitting">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Camera Forward Sitting" />
-    </rows>
-    <rows
-     name="move_backward_sitting"
-     value="move_backward_sitting">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Camera Backward Sitting" />
-    </rows>
-    <rows
-     name="spin_over_sitting"
-     value="spin_over_sitting">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Camera Spin Over Sitting" />
-    </rows>
-    <rows
-     name="spin_under_sitting"
-     value="spin_under_sitting">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Camera Spin Under Sitting" />
-    </rows>
-    <rows
-     name="spin_around_ccw_sitting"
-     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
-     name="spin_around_cw_sitting"
-     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>
-</contents>
diff --git a/indra/newview/skins/default/xui/en/control_table_contents_columns_basic.xml b/indra/newview/skins/default/xui/en/control_table_contents_columns_basic.xml
deleted file mode 100644
index e707aaf22c..0000000000
--- a/indra/newview/skins/default/xui/en/control_table_contents_columns_basic.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?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="Primary 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" />
-</contents>
diff --git a/indra/newview/skins/default/xui/en/control_table_contents_editing.xml b/indra/newview/skins/default/xui/en/control_table_contents_editing.xml
deleted file mode 100644
index 2a3314840a..0000000000
--- a/indra/newview/skins/default/xui/en/control_table_contents_editing.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<contents>
-    <rows
-     enabled="false"
-     name="editing_actions"
-     value="">
-        <columns
-         type="icontext"
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         label="Editing"
-         name="lst_action"
-         value="Tool_Dozer" />
-    </rows>
-    <rows
-     name="edit_avatar_spin_ccw"
-     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
-     name="edit_avatar_spin_cw"
-     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
-     name="edit_avatar_spin_over"
-     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
-     name="edit_avatar_spin_under"
-     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
-     name="edit_avatar_move_forward"
-     value="edit_avatar_move_forward">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Camera Forward" />
-    </rows>
-    <rows
-     name="edit_avatar_move_backward"
-     value="edit_avatar_move_backward">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Camera Backward" />
-    </rows>
-</contents>
diff --git a/indra/newview/skins/default/xui/en/control_table_contents_media.xml b/indra/newview/skins/default/xui/en/control_table_contents_media.xml
deleted file mode 100644
index ce5d3556b6..0000000000
--- a/indra/newview/skins/default/xui/en/control_table_contents_media.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<contents>
-    <rows
-     enabled="false"
-     name="media_actions"
-     value="">
-        <columns
-         type="icontext"
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         label="Sound and Media"
-         name="lst_action"
-         value="Audio_Press" />
-    </rows>
-    <rows
-     name="toggle_pause_media"
-     value="toggle_pause_media">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Play/Pause Media" />
-    </rows>
-    <rows
-     name="toggle_enable_media"
-     value="toggle_enable_media">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Play/Stop All Media" />
-    </rows>
-    <rows
-     name="voice_follow_key"
-     value="voice_follow_key">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Voice" />
-    </rows>
-    <rows
-     name="toggle_voice"
-     value="toggle_voice">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Toggle Voice" />
-    </rows>
-    <rows
-     name="start_chat"
-     value="start_chat">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Start Chat" />
-    </rows>
-    <rows
-     name="start_gesture"
-     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/control_table_contents_movement.xml b/indra/newview/skins/default/xui/en/control_table_contents_movement.xml
deleted file mode 100644
index b410d2dc1c..0000000000
--- a/indra/newview/skins/default/xui/en/control_table_contents_movement.xml
+++ /dev/null
@@ -1,198 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<contents>
-    <rows
-     enabled="false"
-     name="move_actions"
-     value="">
-        <columns
-         type="icontext"
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         label="Move Actions"
-         name="lst_action"
-         value="Move_Walk_Off" />
-    </rows>
-    <rows
-     name="walk_to"
-     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
-     name="teleport_to"
-     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
-     name="push_forward"
-     value="push_forward">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Move Forward" />
-    </rows>
-    <rows
-     name="push_backward"
-     value="push_backward">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Move Backward" />
-    </rows>
-    <rows
-     name="turn_left"
-     value="turn_left">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Left" />
-    </rows>
-    <rows
-     name="turn_right"
-     value="turn_right">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Right" />
-    </rows>
-    <rows
-     name="slide_left"
-     value="slide_left">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Strafe left" />
-    </rows>
-    <rows
-     name="slide_right"
-     value="slide_right">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Strafe right" />
-    </rows>
-    <rows
-     name="jump"
-     value="jump">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Jump/Up" />
-    </rows>
-    <rows
-     name="push_down"
-     value="push_down">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Down" />
-    </rows>
-    <rows
-     name="run_forward"
-     value="run_forward">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Run Forward" />
-    </rows>
-    <rows
-     name="run_backward"
-     value="run_backward">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Run Backward" />
-    </rows>
-    <rows
-     name="run_left"
-     value="run_left">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Run Left" />
-    </rows>
-    <rows
-     name="run_right"
-     value="run_right">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Run Right" />
-    </rows>
-    <rows
-     name="toggle_run"
-     value="toggle_run">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Toggle Run" />
-    </rows>
-    <rows
-     name="toggle_fly"
-     value="toggle_fly">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Fly/Stop flying" />
-    </rows>
-    <rows
-     name="toggle_sit"
-     value="toggle_sit">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Sit/Stand" />
-    </rows>
-    <rows
-     name="stop_moving"
-     value="stop_moving">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Stop Moving" />
-    </rows>
-</contents>
diff --git a/indra/newview/skins/default/xui/en/floater_preferences.xml b/indra/newview/skins/default/xui/en/floater_preferences.xml
index ee730dcb01..0e62d50072 100644
--- a/indra/newview/skins/default/xui/en/floater_preferences.xml
+++ b/indra/newview/skins/default/xui/en/floater_preferences.xml
@@ -169,13 +169,6 @@ https://accounts.secondlife.com/change_email/
          layout="topleft"
          help_topic="preferences_uploads_tab"
          name="uploads" />
-        <panel
-         class="panel_preference_controls"
-         filename="panel_preferences_controls.xml"
-         label="Controls"
-         layout="topleft"
-         help_topic="preferences_controls_tab"
-         name="controls" />
     </tab_container>
 
 </floater>
diff --git a/indra/newview/skins/default/xui/en/floater_select_key.xml b/indra/newview/skins/default/xui/en/floater_select_key.xml
index 48d9eee4cd..4e89df5a73 100644
--- a/indra/newview/skins/default/xui/en/floater_select_key.xml
+++ b/indra/newview/skins/default/xui/en/floater_select_key.xml
@@ -4,27 +4,10 @@
  border="false"
  can_close="false"
  can_minimize="false"
- height="116"
+ height="90"
  layout="topleft"
  name="modal container"
- width="272">
-  <floater.string
-   name="keyboard">
-    Keyboard
-  </floater.string>
-  <floater.string
-   name="mouse">
-    Mouse Buttons
-  </floater.string>
-  <floater.string
-   name="basic_description">
-Press a key to set your trigger.
-Allowed input: [INPUT].
-  </floater.string>
-  <floater.string
-   name="reserved_by_menu">
-Combination [KEYSTR] is reserved by menu.
-  </floater.string>
+ width="240">
     <text
      type="string"
      halign="center"
@@ -33,47 +16,19 @@ Combination [KEYSTR] is reserved by menu.
      height="30"
      layout="topleft"
      left="30"
-     name="descritption"
+     name="Save item as:"
      top="25"
      word_wrap="true"
-     width="212">
-Press a key to set your trigger.
-Allowed input: [INPUT].
+     width="180">
+        Press a key to set your Speak button trigger.
     </text>
-    <check_box
-     follows="top|left"
-     height="20"
-     initial_value="false"
-     label="Apply to all"
-     layout="topleft"
-     left="90"
-     name="apply_all"
-     tool_tip="Viewer uses different control combinations depending on what you are doing in world, setting this will apply your change to all combinations"
-     top_pad="8"
-     width="160" />
-  
-    <button
-     height="23"
-     label="Set Empty"
-     layout="topleft"
-     left="8"
-     name="SetEmpty"
-     top_pad="6"
-     width="80" />
-    <button
-     height="23"
-     label="Default"
-     layout="topleft"
-     left_pad="8"
-     name="Default"
-     top_delta="0"
-     width="80" />
     <button
      height="23"
      label="Cancel"
+     label_selected="Cancel"
      layout="topleft"
-     left_pad="8"
+     right="-10"
      name="Cancel"
-     top_delta="0"
-     width="80" />
+     top_pad="8"
+     width="100" />
 </floater>
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 6cc91d2cce..32ae56e3af 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -11408,19 +11408,6 @@ Cannot create large prims that intersect other residents.  Please re-try when ot
      notext="Cancel"
      yestext="OK"/>
   </notification>
-  
-  <notification
-   icon="alertmodal.tga"
-   name="PreferenceControlsDefaults"
-   type="alertmodal">
-    Do you want to restore default values for controls?
-    <tag>confirm</tag>
-    <usetemplate
-       canceltext="Cancel"
-       name="yesnocancelbuttons"
-       notext="Current mode"
-       yestext="All modes"/>
-  </notification>
     
   <notification
    icon="alertmodal.tga"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_controls.xml b/indra/newview/skins/default/xui/en/panel_preferences_controls.xml
deleted file mode 100644
index 904387909e..0000000000
--- a/indra/newview/skins/default/xui/en/panel_preferences_controls.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<panel
- border="true"
- follows="all"
- height="408"
- label="Controls"
- layout="topleft"
- left="102"
- name="controls"
- top="1"
- width="517">
-  <combo_box
-   follows="top|left"
-   layout="topleft"
-   top="6"
-   left="10"
-   height="23"
-   width="140"
-   name="key_mode">
-    <combo_box.item
-     label="Third Person "
-     name="third_person"
-     value="1"/>
-    <combo_box.item
-     label="First Person (Mouselook)"
-     name="first_person"
-     value="0"/>
-    <combo_box.item
-     label="Edit Avatar"
-     name="edit_avatar"
-     value="2"/>
-    <combo_box.item
-     label="Sitting"
-     name="sitting"
-     value="3"/>
-  </combo_box>
-
-  <button
-   follows="top|left"
-   layout="topleft"
-   top="6"
-   right="-10"
-   height="23"
-   width="140"
-   label="Restore Defaults"
-   tool_tip="Restores default values for all control modes."
-   name="restore_defaults"/>
-
-  <scroll_list
-   draw_heading="true"
-   follows="all"
-   layout="topleft"
-   column_padding="0"
-   selection_type="header"
-   top="31"
-   left="3"
-   bottom="-3"
-   right="-3"
-   can_sort="false"
-   multi_select="false"
-   name="controls_list"
-   fg_disable_color="ScrollUnselectedColor"/>
-</panel>
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 74c9b10cff..c2defdd772 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
@@ -463,13 +463,52 @@
   enabled_control="EnableVoiceChat"
   control_name="PushToTalkToggle"
   height="15"
-  label="Toggle speak on/off when I press button in toolbar"
+  label="Toggle speak on/off when I press:"
   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"
+     halign="center"
+     height="23"
+     image_overlay="Refresh_Off"
+     layout="topleft"
+     tool_tip="Reset to Middle Mouse Button"
+     mouse_opaque="true"
+     name="set_voice_middlemouse_button"
+     left_pad="5"
+     width="25">
+    <button.commit_callback
+    function="Pref.VoiceSetMiddleMouse" />
+  </button>
   <button
    control_name="ShowDeviceSettings"
    follows="left|top"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index cd639ded36..1bfac6aeb7 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -4088,15 +4088,6 @@ Try enclosing path to the editor with double quotes.
   <string name="Z">Z</string>
   <!-- Key names end -->
 
-  <!-- Mouse button names (short) begin -->
-  <string name="LMB">LMB</string>
-  <string name="MMB">MMB</string>
-  <string name="RMB">RMB</string>
-  <string name="MB4">MB4</string>
-  <string name="MB5">MB5</string>
-  <string name="Double LMB">Double LMB</string>
-  <!-- Mouse button names end -->
-
   <!-- llviewerwindow -->
   <string name="BeaconParticle">Viewing particle beacons (blue)</string>
   <string name="BeaconPhysical">Viewing physical object beacons (green)</string>