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

Revert "This probably won't fix the active voice list issue"

Browse Source 
This reverts commit 466f901105.
This commit is contained in:
Lirusaito
2019-08-05 16:41:28 -04:00
parent bcf301ce6a
commit 212bd47d36
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
indra/newview/llspeakers.cpp
View File

@@ -1020,10 +1020,11 @@ LLActiveSpeakerMgr::LLActiveSpeakerMgr() : LLSpeakerMgr(NULL)
void LLActiveSpeakerMgr::updateSpeakerList() void LLActiveSpeakerMgr::updateSpeakerList()
{ {
// point to whatever the current voice channel is // point to whatever the current voice channel is
const auto old_channel = mVoiceChannel;
mVoiceChannel = LLVoiceChannel::getCurrentVoiceChannel(); mVoiceChannel = LLVoiceChannel::getCurrentVoiceChannel();
// always populate from active voice channel // always populate from active voice channel
if (LLVoiceChannel::getCurrentVoiceChannel() != mVoiceChannel) //MA: seems this is always false if (mVoiceChannel != old_channel) //Singu Note: Don't let this always be false.
{ {
LL_DEBUGS("Speakers") << "Removed all speakers" << LL_ENDL; LL_DEBUGS("Speakers") << "Removed all speakers" << LL_ENDL;
fireEvent(new LLSpeakerListChangeEvent(this, LLUUID::null), "clear"); fireEvent(new LLSpeakerListChangeEvent(this, LLUUID::null), "clear");