diff options
author | Mike Antipov <mantipov@productengine.com> | 2010-05-27 17:37:42 +0300 |
---|---|---|
committer | Mike Antipov <mantipov@productengine.com> | 2010-05-27 17:37:42 +0300 |
commit | 6fc170b12fa2663d7f4cc850ff30173a7ce780fc (patch) | |
tree | 86481cdde259ce1937aa419919d9ff98d89074f2 /indra/newview/llvoicevivox.cpp | |
parent | 621df44f2b504cb1576e613ca8ab1784e93b1a52 (diff) | |
parent | cf2268635ca6aef99b1d6c01083be4b4a292646a (diff) |
merge
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llvoicevivox.cpp')
-rw-r--r-- | indra/newview/llvoicevivox.cpp | 8 |
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 { |