SL-6109

- Fixed line endings in xml file
- Removed obsolete UI element and it's code
- Fixed issue with return value caused by rebase

5 files changed, 570 insertions, 621 deletions

diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp
index 61fd13f219..8328f9914e 100644
--- a/indra/newview/llfloaterpreference.cpp
+++ b/indra/newview/llfloaterpreference.cpp
@@ -285,7 +285,6 @@ LLFloaterPreference::LLFloaterPreference(const LLSD& key)
 	mCommitCallbackRegistrar.add("Pref.ResetCache",				boost::bind(&LLFloaterPreference::onClickResetCache, this));
 	mCommitCallbackRegistrar.add("Pref.ClickSkin",				boost::bind(&LLFloaterPreference::onClickSkin, this,_1, _2));
 	mCommitCallbackRegistrar.add("Pref.SelectSkin",				boost::bind(&LLFloaterPreference::onSelectSkin, this));
-	mCommitCallbackRegistrar.add("Pref.VoiceSetMiddleMouse",	boost::bind(&LLFloaterPreference::onClickSetMiddleMouse, this));
 	mCommitCallbackRegistrar.add("Pref.SetSounds",				boost::bind(&LLFloaterPreference::onClickSetSounds, this));
 	mCommitCallbackRegistrar.add("Pref.ClickEnablePopup",		boost::bind(&LLFloaterPreference::onClickEnablePopup, this));
 	mCommitCallbackRegistrar.add("Pref.ClickDisablePopup",		boost::bind(&LLFloaterPreference::onClickDisablePopup, this));	
@@ -1571,21 +1570,6 @@ void LLFloaterPreference::onChangeQuality(const LLSD& data)
 	refresh();
 }
 
-void LLFloaterPreference::onClickSetMiddleMouse()
-{
-	LLUICtrl* p2t_line_editor = getChild<LLUICtrl>("modifier_combo");
-
-	// update the control right away since we no longer wait for apply
-	p2t_line_editor->setControlValue(MIDDLE_MOUSE_CV);
-
-	//push2talk button "middle mouse" control value is in English, need to localize it for presentation
-	LLPanel* advanced_preferences = dynamic_cast<LLPanel*>(p2t_line_editor->getParent());
-	if (advanced_preferences)
-	{
-		p2t_line_editor->setValue(advanced_preferences->getString("middle_mouse"));
-	}
-}
-
 void LLFloaterPreference::onClickSetSounds()
 {
 	// Disable Enable gesture sounds checkbox if the master sound is disabled 
@@ -2272,25 +2256,6 @@ BOOL LLPanelPreference::postBuild()
 		getChild<LLTextBox>("mute_chb_label")->setClickedCallback(boost::bind(&toggleMuteWhenMinimized));
 	}
 
-	//////////////////////PanelAdvanced ///////////////////
-	if (hasChild("modifier_combo", TRUE))
-	{
-		//localizing if push2talk button is set to middle mouse
-		std::string modifier_value = getChild<LLUICtrl>("modifier_combo")->getValue().asString();
-		if (MIDDLE_MOUSE_CV == modifier_value)
-		{
-			getChild<LLUICtrl>("modifier_combo")->setValue(getString("middle_mouse"));
-		}
-		else if (MOUSE_BUTTON_4_CV == modifier_value)
-		{
-			getChild<LLUICtrl>("modifier_combo")->setValue(getString("button4_mouse"));
-		}
-		else if (MOUSE_BUTTON_5_CV == modifier_value)
-		{
-			getChild<LLUICtrl>("modifier_combo")->setValue(getString("button5_mouse"));
-		}
-	}
-
 	//////////////////////PanelSetup ///////////////////
 	if (hasChild("max_bandwidth"), TRUE)
 	{
diff --git a/indra/newview/llfloaterpreference.h b/indra/newview/llfloaterpreference.h
index bc19564bf6..f08f2aa2ba 100644
--- a/indra/newview/llfloaterpreference.h
+++ b/indra/newview/llfloaterpreference.h
@@ -143,7 +143,6 @@ public:
 	void onClickResetCache();
 	void onClickSkin(LLUICtrl* ctrl,const LLSD& userdata);
 	void onSelectSkin();
-	void onClickSetMiddleMouse();
 	void onClickSetSounds();
 	void onClickEnablePopup();
 	void onClickDisablePopup();	
diff --git a/indra/newview/llviewerinput.cpp b/indra/newview/llviewerinput.cpp
index fda521933f..8df66b4ce9 100644
--- a/indra/newview/llviewerinput.cpp
+++ b/indra/newview/llviewerinput.cpp
@@ -1309,7 +1309,7 @@ bool LLViewerInput::scanKey(KEY key, BOOL key_down, BOOL key_up, BOOL key_level)
 {
 	if (LLApp::isExiting())
 	{
-		return;
+		return false;
 	}
 
 	S32 mode = getMode();
diff --git a/indra/newview/skins/default/xui/en/control_table_contents.xml b/indra/newview/skins/default/xui/en/control_table_contents.xml
index 7d4b9be894..f078e80dff 100644
--- a/indra/newview/skins/default/xui/en/control_table_contents.xml
+++ b/indra/newview/skins/default/xui/en/control_table_contents.xml
@@ -1,569 +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

-         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

-         type="icon"

-         color="0 0 0 0.7"

-         halign="center"

-         value="menu_separator" />

-    </rows>

-    <rows

-     enabled="false"

-     value="">

-        <columns

-         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

-         type="icon"

-         color="0 0 0 0.7"

-         halign="center"

-         value="menu_separator" />

-    </rows>

-    <rows

-     enabled="false"

-     value="">

-        <columns

-         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

-         type="icon"

-         color="0 0 0 0.7"

-         halign="center"

-         value="menu_separator" />

-    </rows>

-    <rows

-     enabled="false"

-     value="">

-        <columns

-         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>

+<?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
+         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
+         type="icon"
+         color="0 0 0 0.7"
+         halign="center"
+         value="menu_separator" />
+    </rows>
+    <rows
+     enabled="false"
+     value="">
+        <columns
+         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
+         type="icon"
+         color="0 0 0 0.7"
+         halign="center"
+         value="menu_separator" />
+    </rows>
+    <rows
+     enabled="false"
+     value="">
+        <columns
+         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
+         type="icon"
+         color="0 0 0 0.7"
+         halign="center"
+         value="menu_separator" />
+    </rows>
+    <rows
+     enabled="false"
+     value="">
+        <columns
+         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_sound.xml b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
index 6b54438b05..c2995393fd 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
@@ -471,21 +471,6 @@
   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"/>
   <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"
    height="23"