Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

This probably will fix the active voice list issue

Browse Source
This commit is contained in:
Liru Færs
2019-08-05 21:03:25 -04:00
parent 212bd47d36
commit 782d71a745
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
indra/newview/llvoicevivox.cpp
View File

@@ -3564,6 +3564,11 @@ void LLVivoxVoiceClient::participantUpdatedEvent(
*/ */
LLVoiceChannel* voice_cnl = LLVoiceChannel::getCurrentVoiceChannel(); LLVoiceChannel* voice_cnl = LLVoiceChannel::getCurrentVoiceChannel();
// Singu Note: This block is different so we also update the active speaker list.
// 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.
bool moderate = gAgentID == participant->mAvatarID;
// ignore session ID of local chat // ignore session ID of local chat
if (voice_cnl && voice_cnl->getSessionID().notNull()) if (voice_cnl && voice_cnl->getSessionID().notNull())
{ {
@@ -3576,14 +3581,20 @@ void LLVivoxVoiceClient::participantUpdatedEvent(
{ {
speaker_manager->update(true); speaker_manager->update(true);
// also initialize voice moderate_mode depend on Agent's participant. See EXT-6937. if (moderate)
// *TODO: remove once a way to request the current voice channel moderation mode is implemented.
if (gAgent.getID() == participant->mAvatarID)
{ {
speaker_manager->initVoiceModerateMode(); speaker_manager->initVoiceModerateMode();
} }
} }
} }
else if (voice_cnl) // Local
{
LLLocalSpeakerMgr::instance().update(true);
}
// Always update active speakers
auto& inst(LLActiveSpeakerMgr::instance());
inst.update(true);
if (moderate) inst.initVoiceModerateMode();
} }
else else
{ {