From bae06b4b62587bd567495e3940a323e4c635a63e Mon Sep 17 00:00:00 2001
From: James Cook <james@lindenlab.com>
Date: Fri, 7 May 2010 16:47:39 -0700
Subject: DEV-49780 Moved Display Names debug toggle to Advanced Prefs

---
 indra/newview/skins/default/xui/en/panel_preferences_advanced.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

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

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 e604e401f6..8d49d3dfcd 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
@@ -271,4 +271,12 @@ Automatic position for:
           <button.commit_callback
           function="Pref.VoiceSetMiddleMouse" />
     </button>
+  <check_box
+  follows="top|left"
+  height="15"
+  label="Use Display Names (PLACEHOLDER)"
+  left="30"
+  name="display_names_check"
+  width="237"
+  tool_tip="Check to use display names in chat, IM, name tags, etc."/>
 </panel>
-- 
cgit v1.2.3


From 49d6cf471df112eff54eba050f1aa57647c130c3 Mon Sep 17 00:00:00 2001
From: James Cook <james@lindenlab.com>
Date: Tue, 11 May 2010 17:27:27 -0700
Subject: Clean up merge, advanced preferences layout

---
 indra/newview/skins/default/xui/en/panel_preferences_advanced.xml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

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

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 063d51e08d..2452067383 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
@@ -301,6 +301,7 @@ Automatic position for:
      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"
@@ -314,7 +315,7 @@ Automatic position for:
  label="Other Devices"
  left="30"
  name="joystick_setup_button"
- top_pad="12"
+ top_pad="5"
  width="155">
     <button.commit_callback
      function="Floater.Show"
@@ -324,8 +325,10 @@ Automatic position for:
   follows="top|left"
   height="15"
   label="Use Display Names (PLACEHOLDER)"
+  layout="topleft" 
   left="30"
   name="display_names_check"
   width="237"
-  tool_tip="Check to use display names in chat, IM, name tags, etc."/>
+  tool_tip="Check to use display names in chat, IM, name tags, etc."
+  top_pad="5"/>
 </panel>
-- 
cgit v1.2.3


From c3ccbecfdae1df3738775d1165cb3361b4f06d90 Mon Sep 17 00:00:00 2001
From: Leyla Farazha <leyla@lindenlab.com>
Date: Wed, 12 May 2010 16:46:26 -0700
Subject: DEV-50013 Add "Turning off Display Names" preference reviewed by
 James

---
 indra/newview/skins/default/xui/en/panel_preferences_advanced.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

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

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 2452067383..e3ee14771c 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
@@ -125,7 +125,8 @@ Automatic position for:
      left_pad="30"
      name="first_person_avatar_visible"
      width="256" />
-    <check_box
+   
+<check_box
      control_name="ArrowKeysAlwaysMove"
      follows="left|top"
      height="20"
@@ -322,6 +323,7 @@ Automatic position for:
      parameter="pref_joystick" />
   </button>
   <check_box
+  control_name="UseDisplayNames" 
   follows="top|left"
   height="15"
   label="Use Display Names (PLACEHOLDER)"
@@ -330,5 +332,5 @@ Automatic position for:
   name="display_names_check"
   width="237"
   tool_tip="Check to use display names in chat, IM, name tags, etc."
-  top_pad="5"/>
+  top_pad="5"/> 
 </panel>
-- 
cgit v1.2.3


From efa00298b3e806a92ced61803b2bbe8ca40d1681 Mon Sep 17 00:00:00 2001
From: Leyla Farazha <leyla@lindenlab.com>
Date: Mon, 17 May 2010 17:11:27 -0700
Subject: updated preferences placement for display names option reviewed by
 James

---
 .../skins/default/xui/en/panel_preferences_advanced.xml   | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

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

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 e3ee14771c..88b60ea3c8 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
@@ -205,7 +205,7 @@ Automatic position for:
    layout="topleft"
    left="30"
    name="UI Size:"
-   top_pad="5"
+   top_pad="15"
    width="300">
     UI size
   </text>
@@ -316,21 +316,10 @@ Automatic position for:
  label="Other Devices"
  left="30"
  name="joystick_setup_button"
- top_pad="5"
+ top_pad="10"
  width="155">
     <button.commit_callback
      function="Floater.Show"
      parameter="pref_joystick" />
   </button>
-  <check_box
-  control_name="UseDisplayNames" 
-  follows="top|left"
-  height="15"
-  label="Use Display Names (PLACEHOLDER)"
-  layout="topleft" 
-  left="30"
-  name="display_names_check"
-  width="237"
-  tool_tip="Check to use display names in chat, IM, name tags, etc."
-  top_pad="5"/> 
 </panel>
-- 
cgit v1.2.3


From 8947724baa6d595844daeee2f18c865d1886acc5 Mon Sep 17 00:00:00 2001
From: Kent Quirk <q@lindenlab.com>
Date: Tue, 26 Oct 2010 23:13:36 -0400
Subject: STORM-482; change to allow 1023 characters again in local chat. While
 fixing this, I noticed that a change to XUI meant that many floaters had
 tried to set a limit on text length for line_editor components but it didn't
 take effect because the parameter name was wrong; I changed them to agree.

---
 indra/newview/skins/default/xui/en/panel_preferences_advanced.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

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 7d9bd1bf2a..9d496575c9 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
@@ -280,7 +280,7 @@ Automatic position for:
      enabled_control="EnableVoiceChat"
      height="23"
      left="80"
-     max_length="200"
+     max_length_bytes="200"
      name="modifier_combo"
      label="Push-to-Speak trigger"
      top_pad="5"
-- 
cgit v1.2.3


From 2e7779e66cdb638803202fcb5a7b0e30d7c5fafc Mon Sep 17 00:00:00 2001
From: Paul Guslisty <pguslisty@productengine.com>
Date: Wed, 10 Nov 2010 16:23:26 +0200
Subject: STORM-572 FIXED Move "Bubble Chat" preference from Advanced to Chat

- Moved checkbox "Bubble Chat" from Advanced to Chat panel of Preferences floater
---
 .../skins/default/xui/en/panel_preferences_advanced.xml      | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

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

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 9d496575c9..e17d4768d4 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
@@ -155,17 +155,7 @@ Automatic position for:
      left_delta="0"
      name="enable_lip_sync"
      width="237"
-     top_pad="0" />
-        <check_box
-     control_name="UseChatBubbles"
-     follows="left|top"
-     height="16"
-     label="Bubble chat"
-     layout="topleft"
-     left="78"
-     top_pad="6"
-     name="bubble_text_chat"
-     width="150" />
+     top_pad="0" />        
     <slider
      control_name="ChatBubbleOpacity"
      follows="left|top"
-- 
cgit v1.2.3


From 51e38dff76fce7f0fe5b665f8707931435e2ff99 Mon Sep 17 00:00:00 2001
From: Paul Guslisty <pguslisty@productengine.com>
Date: Thu, 11 Nov 2010 16:45:35 +0200
Subject: STORM-587 FIXED Layout cleanup in the Advanced tab of Preferences

- According to the specification deleted all controls except:
    1. "UI Size" slider
    2. "Show script errors in" radio group

- According to the specification:
    1. "Allow Multiple Viewer" checkbox
    2. "Show Grid Selection at login" checkbox
    3. "Show Advanced Manu" checkbox
    4. "Show Developer Menu" checkbox
---
 .../default/xui/en/panel_preferences_advanced.xml  | 259 +++------------------
 1 file changed, 32 insertions(+), 227 deletions(-)

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

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 e17d4768d4..6f4beea43a 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
@@ -17,188 +17,17 @@
      name="middle_mouse">
         Middle Mouse
     </panel.string>
-         <icon
-	 follows="left|top"
-	 height="18"
-	 image_name="Cam_FreeCam_Off"
-         layout="topleft"
-	 name="camera_icon"
-	 mouse_opaque="false"
-	 visible="true"
-	 width="18"
-         left="30"
-         top="10"/>
-    <slider
-     can_edit_text="true"
-     control_name="CameraAngle"
-     decimal_digits="2"
-     follows="left|top"
-     height="16"
-     increment="0.025"
-     initial_value="1.57"
-     layout="topleft"
-     label_width="100"
-     label="View angle"
-     left_pad="30"
-     max_val="2.97"
-     min_val="0.17"
-     name="camera_fov"
-     show_text="false"
-     width="240" />
-    <slider
-     can_edit_text="true"
-     control_name="CameraOffsetScale"
-     decimal_digits="2"
-     follows="left|top"
-     height="16"
-     increment="0.025"
-     initial_value="1"
-     layout="topleft"
-     label="Distance"
-     left_delta="0"
-     label_width="100"
-     max_val="3"
-     min_val="0.5"
-     name="camera_offset_scale"
-     show_text="false"
-     width="240"
-     top_pad="5"/>
-     <text
-     follows="left|top"
-     type="string"
-     length="1"
-     height="10"
-     left="80"
-     name="heading2"
-     width="270"
-     top_pad="5">
-Automatic position for:
-	</text>
-        <check_box
-     control_name="EditCameraMovement"
-     height="20"
-     follows="left|top"
-     label="Build/Edit"
-     layout="topleft"
-     left_delta="30"
-     name="edit_camera_movement"
-     tool_tip="Use automatic camera positioning when entering and exiting edit mode"
-     width="280"
-     top_pad="5" />
-    <check_box
-     control_name="AppearanceCameraMovement"
-     follows="left|top"
-     height="16"
-     label="Appearance"
-     layout="topleft"
-     name="appearance_camera_movement"
-     tool_tip="Use automatic camera positioning while in edit mode"
-     width="242" />
-    <check_box
-     control_name="SidebarCameraMovement"
-     follows="left|top"
-     height="16"
-     initial_value="true"
-     label="Sidebar"
-     layout="topleft"
-     name="appearance_sidebar_positioning"
-     tool_tip="Use automatic camera positioning for sidebar"
-     width="242" />
-     	<icon
-	 follows="left|top"
-	 height="18"
-	 image_name="Move_Walk_Off"
-         layout="topleft"
-	 name="avatar_icon"
-	 mouse_opaque="false"
-	 visible="true"
-	 width="18"
-         top_pad="2"
-         left="30"
-         />
-    <check_box
-     control_name="FirstPersonAvatarVisible"
-     follows="left|top"
-     height="20"
-     label="Show me in Mouselook"
-     layout="topleft"
-     left_pad="30"
-     name="first_person_avatar_visible"
-     width="256" />
-   
-    <check_box
-     control_name="ArrowKeysAlwaysMove"
-     follows="left|top"
-     height="20"
-     label="Arrow keys always move me"
-     layout="topleft"
-     left_delta="0"
-     name="arrow_keys_move_avatar_check"
-     width="237"
-     top_pad="0"/>
-    <check_box
-     control_name="AllowTapTapHoldRun"
-     follows="left|top"
-     height="20"
-     label="Tap-tap-hold to run"
-     layout="topleft"
-     left_delta="0"
-     name="tap_tap_hold_to_run"
-     width="237"
-     top_pad="0"/>
-    <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="0" />        
-    <slider
-     control_name="ChatBubbleOpacity"
-     follows="left|top"
-     height="16"
-     increment="0.05"
-     initial_value="1"
-     label="Opacity"
-     layout="topleft"
-     left="80"
-     label_width="156"
-     name="bubble_chat_opacity"
-     top_pad = "10"
-     width="347" />
-    <color_swatch
-     can_apply_immediately="true"
-     color="0 0 0 1"
-     control_name="BackgroundChatColor"
-     follows="left|top"
-     height="50"
-     layout="topleft"
-     left_pad="30"
-     top="190"
-     name="background"
-     tool_tip="Choose color for bubble chat"
-     width="38">
-        <color_swatch.init_callback
-		     function="Pref.getUIColor"
-		     parameter="BackgroundChatColor" />
-		    <color_swatch.commit_callback
-		     function="Pref.applyUIColor"
-		     parameter="BackgroundChatColor" />
-    </color_swatch>
   <text
    type="string"
    length="1"
    follows="left|top"
    height="12"
    layout="topleft"
-   left="80"
+   left="33"
    name="UI Size:"
    top_pad="25"
-   width="300">
-    UI size
+   width="100">
+    UI size:
   </text>
   <slider
    control_name="UIScaleFactor"
@@ -213,7 +42,7 @@ Automatic position for:
    min_val="0.75"
    name="ui_scale_slider"
    top_pad="-14"
-   width="180" />
+   width="250" />
     <check_box
      control_name="ShowScriptErrors"
      follows="left|top"
@@ -252,65 +81,41 @@ Automatic position for:
          top_delta="0"
          width="315" />
     </radio_group>
-     <check_box
+
+    <check_box
      follows="top|left"
-     enabled_control="EnableVoiceChat"
-     control_name="PushToTalkToggle"
      height="15"
-     label="Toggle speak on/off when I press:"
+     label="Allow Multiple Viewer"
      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
+     top_pad="20"
+     width="237"/>
+    <check_box
      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"
+     height="15"
+     label="Show Grid Selection at login"
+     layout="topleft"
+     left="30"
+     name="push_to_talk_toggle_check"
      top_pad="5"
-     width="200" />
-    <button
-     layout="topleft" 
+     width="237"/>
+    <check_box
      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"
+     height="15"
+     label="Show Advanced Manu"
+     layout="topleft"
+     left="30"
+     name="push_to_talk_toggle_check"
+     top_pad="5"
+     width="237"/>
+    <check_box
      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
- height="23"
- label="Other Devices"
- left="30"
- name="joystick_setup_button"
- top_pad="27"
- width="155">
-    <button.commit_callback
-     function="Floater.Show"
-     parameter="pref_joystick" />
-  </button>
+     height="15"
+     label="Show Developer Menu"
+     layout="topleft"
+     left="30"
+     name="push_to_talk_toggle_check"
+     top_pad="5"
+     width="237"/>
 </panel>
-- 
cgit v1.2.3


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

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

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


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/panel_preferences_advanced.xml')

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


From 29a36c21db57729ff86785745c90ffbf93875edb Mon Sep 17 00:00:00 2001
From: Andrew Productengine <adyukov@productengine.com>
Date: Fri, 12 Nov 2010 18:18:44 +0200
Subject: STORM-571 FIXED Moved voice prefs from advanced to Sound&Media and
 changed layout accordingly.

This changeset also covers STORM-572 (note that design in this fix differs a little from the one proposed in there because there was not enough space to make it that way).
---
 indra/newview/skins/default/xui/en/panel_preferences_advanced.xml | 4 ----
 1 file changed, 4 deletions(-)

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

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 c1fb0243b7..15d1222d00 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
@@ -13,10 +13,6 @@
      name="aspect_ratio_text">
         [NUM]:[DEN]
     </panel.string>
-    <panel.string
-     name="middle_mouse">
-        Middle Mouse
-    </panel.string>
   <text
    type="string"
    length="1"
-- 
cgit v1.2.3


From 00ada8dccd50cf04e5ea16f200ce3c6bfbee5023 Mon Sep 17 00:00:00 2001
From: Paul Guslisty <pguslisty@productengine.com>
Date: Wed, 17 Nov 2010 15:09:08 +0200
Subject: STORM-588 FIXED Add a Preference that allows users to run multiple
 Viewer instances

- Added a control_name for the "AllowMultipleViewers" checkbox
---
 indra/newview/skins/default/xui/en/panel_preferences_advanced.xml | 1 +
 1 file changed, 1 insertion(+)

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

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 15d1222d00..dd01683c51 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
@@ -79,6 +79,7 @@
     </radio_group>
 
     <check_box
+     control_name="AllowMultipleViewers"
      follows="top|left"
      height="15"
      label="Allow Multiple Viewer"
-- 
cgit v1.2.3


From 7e9572fab5643f52a44f06249109f7e77b656e3b Mon Sep 17 00:00:00 2001
From: Paul Guslisty <pguslisty@productengine.com>
Date: Wed, 17 Nov 2010 15:21:58 +0200
Subject: STORM-589 FIXED Add a Preference that allows users to display the
 grid selection drop-down on the login screen

- Added a control_name for the "Show Grid Selection at login" checkbox
---
 indra/newview/skins/default/xui/en/panel_preferences_advanced.xml | 1 +
 1 file changed, 1 insertion(+)

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

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 15d1222d00..cfc7a0d5ae 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
@@ -88,6 +88,7 @@
      top_pad="20"
      width="237"/>
     <check_box
+     control_name="ForceShowGrid"
      follows="top|left"
      height="15"
      label="Show Grid Selection at login"
-- 
cgit v1.2.3


From 14b2b796abf4e2f1538ca337f675166a22478868 Mon Sep 17 00:00:00 2001
From: Paul Guslisty <pguslisty@productengine.com>
Date: Wed, 17 Nov 2010 15:31:23 +0200
Subject: STORM-590 FIXED Add Preferences to enable the display of the Advanced
 and Development menus

- Added control_names for the "Show Advanced Menu" and "QAMode" checkboxes
---
 indra/newview/skins/default/xui/en/panel_preferences_advanced.xml | 2 ++
 1 file changed, 2 insertions(+)

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

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 15d1222d00..ae9711418e 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
@@ -97,6 +97,7 @@
      top_pad="5"
      width="237"/>
     <check_box
+     control_name="UseDebugMenus"
      follows="top|left"
      height="15"
      label="Show Advanced Menu"
@@ -106,6 +107,7 @@
      top_pad="5"
      width="237"/>
     <check_box
+     control_name="QAMode"
      follows="top|left"
      height="15"
      label="Show Developer Menu"
-- 
cgit v1.2.3


From 085a8b260d6cdb83c42fd98579a4ef5971bbc893 Mon Sep 17 00:00:00 2001
From: Paul Guslisty <pguslisty@productengine.com>
Date: Sat, 18 Dec 2010 12:18:03 +0200
Subject: STORM-801 FIXED Wrong checkbox label in panel preferences, advanced
 tab

- Corrected checkbox label
---
 indra/newview/skins/default/xui/en/panel_preferences_advanced.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

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 d6e4c56113..37aab059a9 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
@@ -82,7 +82,7 @@
      control_name="AllowMultipleViewers"
      follows="top|left"
      height="15"
-     label="Allow Multiple Viewer"
+     label="Allow Multiple Viewers"
      layout="topleft"
      left="30"
      name="allow_multiple_viewer_check"
-- 
cgit v1.2.3