From 2287f7612ce0e2cbc439c4ce048edcb2df3b3d40 Mon Sep 17 00:00:00 2001
From: Paul Guslisty <pguslisty@productengine.com>
Date: Thu, 11 Nov 2010 18:49:55 +0200
Subject: STORM-587 ADDITIONAL FIX Layout cleanup in the Advanced tab of
 Preferences

- Temporary restored controls:
    1. "Move avatar lips when speaking" checkbox
    2. "Toggle speak on/off when I press:" checkbox
    3. "Push-to-Speak trigger" lineeditor
    4. "set_voice_hotkey_button" button
    5. "set_voice_middlemouse_button" button

They should be moved to the Sound&Media panel of floater Preferences. But the specification for the Sound&Media panel is not ready yet.
As specification will be ready, these controls will be moved to the Sound&Media panel.
---
 .../default/xui/en/panel_preferences_advanced.xml  | 64 +++++++++++++++++++++-
 1 file changed, 63 insertions(+), 1 deletion(-)

diff --git a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
index 6f4beea43a..6a9ea5afb6 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
@@ -103,7 +103,7 @@
     <check_box
      follows="top|left"
      height="15"
-     label="Show Advanced Manu"
+     label="Show Advanced Menu"
      layout="topleft"
      left="30"
      name="push_to_talk_toggle_check"
@@ -118,4 +118,66 @@
      name="push_to_talk_toggle_check"
      top_pad="5"
      width="237"/>
+     
+    <check_box
+     control_name="LipSyncEnabled"
+     follows="left|top"
+     height="20"
+     label="Move avatar lips when speaking"
+     layout="topleft"
+     left_delta="0"
+     name="enable_lip_sync"
+     width="237"
+     top_pad="130" />
+     
+     <check_box
+     follows="top|left"
+     enabled_control="EnableVoiceChat"
+     control_name="PushToTalkToggle"
+     height="15"
+     label="Toggle speak on/off when I press:"
+     layout="topleft"
+     left="30"
+     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."/>
+    <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="5"
+     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>
 </panel>
-- 
cgit v1.2.3