diff options
| author | Monroe Linden <monroe@lindenlab.com> | 2010-10-13 18:02:05 -0700 |
|---|---|---|
| committer | Monroe Linden <monroe@lindenlab.com> | 2010-10-13 18:02:05 -0700 |
| commit | aac0d48d7d97730c95cfb541e303167a8e28d369 (patch) | |
| tree | 42edf2d5594e0f8f96bb6af156039d910ca9a50a | |
| parent | 0732b48be9c6378c31515ed92d29101e3743c8c9 (diff) | |
Fix for EXP-220 -- Remove voice dot for skylight user
Reviewed by Richard.
| -rw-r--r-- | indra/newview/llvoavatar.cpp | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index c31714de5a..7d8c1405ec 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -2326,8 +2326,19 @@ BOOL LLVOAvatar::idleUpdate(LLAgent &agent, LLWorld &world, const F64 &time) void LLVOAvatar::idleUpdateVoiceVisualizer(bool voice_enabled) { - // disable voice visualizer when in mouselook - mVoiceVisualizer->setVoiceEnabled( voice_enabled && !(isSelf() && gAgentCamera.cameraMouselook()) ); + bool render_visualizer = voice_enabled; + + // Don't render the user's own voice visualizer when in mouselook, or when opening the mic is disabled. + if(isSelf()) + { + if(gAgentCamera.cameraMouselook() || gSavedSettings.getBOOL("VoiceDisableMic")) + { + render_visualizer = false; + } + } + + mVoiceVisualizer->setVoiceEnabled(render_visualizer); + if ( voice_enabled ) { //---------------------------------------------------------------- |