Merge from viewer2. Minor conflict resolved.

1 files changed, 1 insertions, 6 deletions

diff --git a/indra/newview/llspeakingindicatormanager.cpp b/indra/newview/llspeakingindicatormanager.cpp
index 42db6bf9c3..5e1d408e8d 100644
--- a/indra/newview/llspeakingindicatormanager.cpp
+++ b/indra/newview/llspeakingindicatormanager.cpp
@@ -36,7 +36,6 @@
 #include "llspeakingindicatormanager.h"
 
 
-#include "llagentdata.h"
 #include "llvoicechannel.h"
 #include "llvoiceclient.h"
 
@@ -134,7 +133,7 @@ private:
 //////////////////////////////////////////////////////////////////////////
 void SpeakingIndicatorManager::registerSpeakingIndicator(const LLUUID& speaker_id, LLSpeakingIndicator* const speaking_indicator)
 {
-	if (speaker_id == gAgentID) return;
+	// do not exclude agent's indicators. They should be processed in the same way as others. See EXT-3889.
 
 	LL_DEBUGS("SpeakingIndicator") << "Registering indicator: " << speaker_id << LL_ENDL;
 	speaking_indicator_value_t value_type(speaker_id, speaking_indicator);
@@ -229,10 +228,6 @@ void SpeakingIndicatorManager::switchSpeakerIndicators(const speaker_ids_t& spea
 				mSwitchedIndicatorsOn.insert(*it_uuid);
 			}
 		}
-		else
-		{
-			LL_WARNS("SpeakingIndicator") << "indicator was not found among registered: " << *it_uuid << LL_ENDL;
-		}
 	}
 }