Merge remote-tracking branch 'secondlife/release/2024.09-ExtraFPS' into 2024.09-ExtraFPS

1 files changed, 46 insertions, 36 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..a9d80fa7c3 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
@@ -434,6 +434,44 @@
    top_pad="-15"
    width="170" />
   <text
+   layout="topleft"
+   height="15"
+   left="260"
+   top_pad="-18"
+   width="100"
+   name="noise_suppression_label">
+     Noise Suppression
+  </text>
+  <combo_box
+   control_name="VoiceNoiseSuppressionLevel"
+   layout="topleft"
+   height="23"
+   left_pad="10"
+   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
    type="string"
    length="1"
    follows="left|top"
@@ -524,44 +562,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"