diff options
author | Erik Kundiman <erik@megapahit.org> | 2024-08-03 19:50:19 +0800 |
---|---|---|
committer | Erik Kundiman <erik@megapahit.org> | 2024-08-03 19:50:19 +0800 |
commit | b7a79709003b1f7f0451ba577576040fc03e50f9 (patch) | |
tree | b698a84bf52c40a2907ac3eaab7b0de2ba6a1055 /indra/newview/llvoavatar.cpp | |
parent | 96d322edfcb97096f701ef11d5fdd1f1c97255ac (diff) | |
parent | b89076f0567547b9c2749595af5ae9d5f9de9f3a (diff) |
Merge branch 'webrtc-voice' into tmp
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 65fcded257..ae322910ea 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()) { |