summaryrefslogtreecommitdiff
path: root/indra/newview/llavatarlistitem.cpp
diff options
context:
space:
mode:
authorJonathan "Geenz" Goodman <geenz@lindenlab.com>2025-05-16 19:05:57 -0400
committerGitHub <noreply@github.com>2025-05-16 19:05:57 -0400
commitbb76eae4b814e612ff2b0c62fffc6c3263058d64 (patch)
tree32818e0c938b465bf39c976955864a14b3bb512e /indra/newview/llavatarlistitem.cpp
parent2efe514f14a0f0b405599301a14413edfce873ee (diff)
parentd5313e7161bb99045adc4a1a34d7f85de609d97b (diff)
Merge branch 'release/2025.04' into geenz/gltf-mesh-import
Diffstat (limited to 'indra/newview/llavatarlistitem.cpp')
-rw-r--r--indra/newview/llavatarlistitem.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llavatarlistitem.cpp b/indra/newview/llavatarlistitem.cpp
index 6ef45ed160..80c7f8beca 100644
--- a/indra/newview/llavatarlistitem.cpp
+++ b/indra/newview/llavatarlistitem.cpp
@@ -325,7 +325,8 @@ void LLAvatarListItem::setShowProfileBtn(bool show)
void LLAvatarListItem::showSpeakingIndicator(bool visible)
{
- if (mSpeakingIndicator)
+ // used only to hide indicator to not contradict with SpeakingIndicatorManager functionality
+ if (mSpeakingIndicator && !visible)
{
mSpeakingIndicator->setIsActiveChannel(visible);
mSpeakingIndicator->setShowParticipantsSpeaking(visible);