From 212bd47d36a9071e9187767e81dfccdbe9ff0c0c Mon Sep 17 00:00:00 2001 From: Lirusaito Date: Mon, 5 Aug 2019 16:41:28 -0400 Subject: [PATCH] Revert "This probably won't fix the active voice list issue" This reverts commit 466f901105c02a70575ff009d116cde1479a5c37. --- indra/newview/llspeakers.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/indra/newview/llspeakers.cpp b/indra/newview/llspeakers.cpp index 653d4347c..a4e11d815 100644 --- a/indra/newview/llspeakers.cpp +++ b/indra/newview/llspeakers.cpp @@ -1020,10 +1020,11 @@ LLActiveSpeakerMgr::LLActiveSpeakerMgr() : LLSpeakerMgr(NULL) void LLActiveSpeakerMgr::updateSpeakerList() { // point to whatever the current voice channel is + const auto old_channel = mVoiceChannel; mVoiceChannel = LLVoiceChannel::getCurrentVoiceChannel(); // 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; fireEvent(new LLSpeakerListChangeEvent(this, LLUUID::null), "clear");