summaryrefslogtreecommitdiff
path: root/indra/newview/llvoicevivox.cpp
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-05-28 09:59:39 +0100
committerTofu Linden <tofu.linden@lindenlab.com>2010-05-28 09:59:39 +0100
commitd5d24548286ccdbc2008fbf8b5a4ea723063ecf0 (patch)
tree7cad61535554bd8fb333ea4b1e2ef34be8712f30 /indra/newview/llvoicevivox.cpp
parentbe6dc84b12c0c12975d8317604e5bff85fa14049 (diff)
parenta7ffd8b7a3d26be6f1841f538631adbb0f3f5604 (diff)
merge from viewer-public
Diffstat (limited to 'indra/newview/llvoicevivox.cpp')
-rw-r--r--indra/newview/llvoicevivox.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/indra/newview/llvoicevivox.cpp b/indra/newview/llvoicevivox.cpp
index bcb1a70efb..1597691347 100644
--- a/indra/newview/llvoicevivox.cpp
+++ b/indra/newview/llvoicevivox.cpp
@@ -3698,9 +3698,15 @@ void LLVivoxVoiceClient::participantUpdatedEvent(
if (speaker_manager)
{
speaker_manager->update(true);
+
+ // also initialize voice moderate_mode depend on Agent's participant. See EXT-6937.
+ // *TODO: remove once a way to request the current voice channel moderation mode is implemented.
+ if (gAgentID == participant->mAvatarID)
+ {
+ speaker_manager->initVoiceModerateMode();
+ }
}
}
-
}
else
{