summaryrefslogtreecommitdiff
path: root/indra/newview/llvoicevisualizer.cpp
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2024-09-12 21:13:10 -0400
committerNat Goodspeed <nat@lindenlab.com>2024-09-12 21:13:10 -0400
commit3d191c09b1b1eb6726fe67f6fdf5445d83536578 (patch)
treefa1c7e42b499638c0487b6af5c59ed048624f4a0 /indra/newview/llvoicevisualizer.cpp
parentb8678d8fa3521f4496ddc569de391633711e46cb (diff)
parentccbd69bf6b287861b41fdb00e9d372746dfc2702 (diff)
Merge branch 'develop' into release/luau-scripting
Diffstat (limited to 'indra/newview/llvoicevisualizer.cpp')
-rw-r--r--indra/newview/llvoicevisualizer.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llvoicevisualizer.cpp b/indra/newview/llvoicevisualizer.cpp
index 9412136272..7691ac54f3 100644
--- a/indra/newview/llvoicevisualizer.cpp
+++ b/indra/newview/llvoicevisualizer.cpp
@@ -337,7 +337,8 @@ void LLVoiceVisualizer::lipSyncOohAah( F32& ooh, F32& aah )
//---------------------------------------------------
void LLVoiceVisualizer::render()
{
- if ( ! mVoiceEnabled )
+ static LLCachedControl<bool> show_visualizer(gSavedSettings, "VoiceVisualizerEnabled", false);
+ if (!mVoiceEnabled || !show_visualizer)
{
return;
}