From 5c18ab7aceabc01fdcf01e86e364621241132966 Mon Sep 17 00:00:00 2001
From: Paul Guslisty <pguslisty@productengine.com>
Date: Fri, 12 Nov 2010 15:35:42 +0200
Subject: STORM-587 ADDITIONAL FIX Layout cleanup in the Advanced tab of
 Preferences

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

- Set proper names for checkboxes

According to the specification these controls are in the Sound&Media panel now.
---
 .../default/xui/en/panel_preferences_advanced.xml  | 70 ++--------------------
 1 file changed, 4 insertions(+), 66 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

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 6a9ea5afb6..c1fb0243b7 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
@@ -88,7 +88,7 @@
      label="Allow Multiple Viewer"
      layout="topleft"
      left="30"
-     name="push_to_talk_toggle_check"
+     name="allow_multiple_viewer_check"
      top_pad="20"
      width="237"/>
     <check_box
@@ -97,7 +97,7 @@
      label="Show Grid Selection at login"
      layout="topleft"
      left="30"
-     name="push_to_talk_toggle_check"
+     name="show_grid_selection_check"
      top_pad="5"
      width="237"/>
     <check_box
@@ -106,7 +106,7 @@
      label="Show Advanced Menu"
      layout="topleft"
      left="30"
-     name="push_to_talk_toggle_check"
+     name="show_advanced_menu_check"
      top_pad="5"
      width="237"/>
     <check_box
@@ -115,69 +115,7 @@
      label="Show Developer Menu"
      layout="topleft"
      left="30"
-     name="push_to_talk_toggle_check"
+     name="show_develop_menu_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