diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-05-28 09:56:21 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-05-28 09:56:21 +0100 |
| commit | a7ffd8b7a3d26be6f1841f538631adbb0f3f5604 (patch) | |
| tree | 8b59519b772b38b01f81689d0e13b3c9cb6d7804 /indra/newview/llvoicevivox.cpp | |
| parent | 8ec4f45daa93ca1acc5e45df2def1b84397127e8 (diff) | |
| parent | a1b973fc2a5d28e64dcf010e3652beda78745d35 (diff) | |
merge from PE's viewer-trunk
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 { |