From 7b71acf77cf365df4130c5e9ff107c9f46a73f4e Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Wed, 11 Sep 2024 03:04:37 +0200
Subject: [PATCH] Replace FSShowVoiceVisualizer with new LL setting
 VoiceVisualizerEnabled

---
 indra/newview/app_settings/settings.xml               | 11 -----------
 indra/newview/llvoavatar.cpp                          |  4 ++--
 .../skins/default/xui/en/panel_preferences_sound.xml  |  2 +-
 3 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index e1a337d617..8455b19c7e 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -22317,17 +22317,6 @@ Change of this parameter will affect the layout of buttons in notification toast
       <integer>1</integer>
     </map>
     <!-- End: Prefs > Sound/Media => UI Sounds -->
-    <key>FSShowVoiceVisualizer</key>
-    <map>
-      <key>Comment</key>
-      <string>Shows the voice visualizer over avatars if enabled.</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>1</integer>
-    </map>
     <key>FSShowMyOwnVoiceVisualizer</key>
     <map>
       <key>Comment</key>
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index 29b86844ef..e8f37022b7 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -2956,8 +2956,8 @@ void LLVOAvatar::idleUpdateVoiceVisualizer(bool voice_enabled, const LLVector3 &
     }
 
     // <FS:Ansariel> FIRE-1916: Hide voice dots over avatars
-    static LLCachedControl<bool> fsShowVoiceVisualizer(gSavedSettings, "FSShowVoiceVisualizer");
-    if (!fsShowVoiceVisualizer)
+    static LLCachedControl<bool> voiceVisualizerEnabled(gSavedSettings, "VoiceVisualizerEnabled");
+    if (!voiceVisualizerEnabled)
     {
         render_visualizer = false;
     }
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 e5f00d27f0..5f35aeaf41 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
@@ -973,7 +973,7 @@
          width="237"/>
         <check_box
          enabled_control="EnableVoiceChat"
-         control_name="FSShowVoiceVisualizer"
+         control_name="VoiceVisualizerEnabled"
          follows="left|top"
          height="15"
          label="Show voice visualizers over avatars"