diff options
author | Brad Linden <brad@lindenlab.com> | 2024-08-01 15:40:41 -0700 |
---|---|---|
committer | Brad Linden <brad@lindenlab.com> | 2024-08-01 15:40:41 -0700 |
commit | 002be0f24321164a74ef2a88c656b7cb0968c7d3 (patch) | |
tree | 6a5a5944f8c5111bdf4e3364f28e003f38dc682f /indra/newview/llvoavatar.cpp | |
parent | 2d69e4d2396d4d5d2e2b9d4959e668e57c08efd0 (diff) | |
parent | 5f66a15142083a047ac945da94f167c24c95f49a (diff) |
Merge remote-tracking branch 'origin/release/webrtc-voice' into release/2024.06-atlasaurus
Diffstat (limited to 'indra/newview/llvoavatar.cpp')
-rw-r--r-- | indra/newview/llvoavatar.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index 4f851eabce..c68ce8d956 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -2817,7 +2817,7 @@ void LLVOAvatar::idleUpdateVoiceVisualizer(bool voice_enabled, const LLVector3 & // Notice the calls to "gAwayTimer.reset()". This resets the timer that determines how long the avatar has been // "away", so that the avatar doesn't lapse into away-mode (and slump over) while the user is still talking. //----------------------------------------------------------------------------------------------------------------- - if (LLVoiceClient::getInstance()->getIsSpeaking( mID )) + if (LLVoiceClient::getInstance()->getIsSpeaking( mID ) && (!isInMuteList() || isSelf())) { if (!mVoiceVisualizer->getCurrentlySpeaking()) { |