1 files changed, 90 insertions, 77 deletions
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 82fb0fe9d7..53ae764ba6 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
@@ -340,7 +340,7 @@
    follows="left|top"
    top_delta="-6"
    layout="topleft"
-   left_pad="10"
+   left_pad="5"
    width="360"
    height="40"
    name="media_ear_location">
@@ -360,7 +360,45 @@
        name="1"
        top_delta ="18"
        width="200" />
-  </radio_group>  
+  </radio_group>
+  <text
+    type="string"
+    length="1"
+    follows="left|top"
+    layout="topleft"
+    left="270"
+    top_delta="6"
+    name="Listen from"
+    width="112">
+    Hear voice from:
+  </text>
+  <radio_group
+    enabled_control="EnableVoiceChat"
+    control_name="VoiceEarLocation"
+    follows="left|top"
+    layout="topleft"
+    left_pad="2"
+    top_delta="-6"
+    width="360"
+    height="40"
+    name="ear_location">
+    <radio_item
+      height="19"
+      label="Camera position"
+      follows="left|top"
+      layout="topleft"
+      name="0"
+      width="200"/>
+    <radio_item
+      height="19"
+      follows="left|top"
+      label="Avatar position"
+      layout="topleft"
+      left_delta="0"
+      name="1"
+      top_delta ="18"
+      width="200" />
+    </radio_group>
  	<check_box
     name="media_show_on_others_btn"
     control_name="MediaShowOnOthers"
@@ -408,12 +446,12 @@
   </combo_box>
   <check_box
    control_name="StreamNotificationChannelEnabled"
-   height="16"
+   height="30"
    label="Custom stream notification channel"
    layout="topleft"
    left="20"
    name="stream_notification_channel_enabled"
-   top_pad="10"
+   top_pad="-10"
    width="256">
   </check_box>
   <spinner
@@ -421,59 +459,62 @@
    enabled_control="StreamNotificationChannelEnabled"
    decimal_digits="0"
    follows="left|top"
-   height="23"
+   height="30"
    increment="1"
    initial_value="751751"
    label="Channel number:"
    label_width="105"
    layout="topleft"
-   left="260"
+   left_pad="0"
    max_val="2147483647"
    min_val="-2147483648"
    name="stream_notification_channel"
-   top_pad="-15"
+   top_pad="-20"
    width="170" />
   <text
-   type="string"
-   length="1"
-   follows="left|top"
    layout="topleft"
-   left="23"
-   top_delta="30"
-   name="Listen from"
-   width="112">
-     Hear voice from:
+   height="15"
+   left="260"
+   top_pad="-48"
+   width="100"
+   name="noise_suppression_label">
+     Noise suppression
   </text>
-  <radio_group
-   enabled_control="EnableVoiceChat"
-   control_name="VoiceEarLocation"
-   follows="left|top"
+  <combo_box
+   control_name="VoiceNoiseSuppressionLevel"
    layout="topleft"
+   height="23"
    left_pad="10"
-   top_delta="-6"
-   width="360"
-   height="40"
-   name="ear_location">
-   <radio_item
-    height="19"
-    label="Camera position"
-    follows="left|top"
-    layout="topleft"
-    name="0"
-    width="200"/>
-   <radio_item
-    height="19"
-    follows="left|top"
-    label="Avatar position"
-    layout="topleft"
-    left_delta="0"
-    name="1"
-    top_delta ="18" 
-    width="200" />
-  </radio_group>
+   top_pad="-20"
+   name="noise_suppression_combo"
+   width="80">
+    <item
+     label="Off"
+     name="noise_suppression_none"
+     value="0"/>
+    <item
+     label="Low"
+     name="noise_suppression_low"
+     value="1"/>
+    <item
+     label="Moderate"
+     name="noise_suppression_moderate"
+     value="2"/>
+    <item
+     label="High"
+     name="noise_suppression_high"
+     value="3"/>
+    <item
+     label="Max"
+     name="noise_suppression_max"
+     value="4"/>
+  </combo_box>
+  <text>
+<!-- spacer -->
+  </text>
   <check_box
    control_name="LipSyncEnabled"
-   follows="left|top"
+   follows="top|left"
    height="15"
    label="Move avatar lips when speaking"
    layout="topleft"
@@ -524,44 +565,16 @@
    label="Play sounds from gestures"
    top_pad="5"
    left="20"/>
-  <text
-   layout="topleft"
+  <check_box
+   control_name="VoiceVisualizerEnabled"
    height="15"
+   tool_tip="Check to show voice dot indicator above avatars"
+   label="Show voice dot above avatars"
+   layout="topleft"
+   name="voice_dot_visualizer"
    left="260"
-   top_pad="-12"
-   width="100"
-   name="noise_suppression_label">
-    Noise Suppression
-  </text>
-  <combo_box
-      control_name="VoiceNoiseSuppressionLevel"
-      layout="topleft"
-      height="23"
-      left_pad="10"
-      top_pad="-18"
-      name="noise_suppression_combo"
-      width="80">
-  <item
-      label="Off"
-      name="noise_suppression_none"
-      value="0"/>
-  <item
-      label="Low"
-      name="noise_suppression_low"
-      value="1"/>
-  <item
-      label="Moderate"
-      name="noise_suppression_moderate"
-      value="2"/>
-  <item
-      label="High"
-      name="noise_suppression_high"
-      value="3"/>
-  <item
-      label="Max"
-      name="noise_suppression_max"
-      value="4"/>
-  </combo_box>
+   top_pad="-15"
+   width="200"/>
   <button
    control_name="ShowDeviceSettings"
    follows="left|top"