CHUI-479 : WIP : Add debug tracing into speaking indicator manager and monitors (to be deleted eventually).

1 files changed, 27 insertions, 2 deletions

diff --git a/indra/newview/lloutputmonitorctrl.cpp b/indra/newview/lloutputmonitorctrl.cpp
index 4a9a50d96a..3569516388 100644
--- a/indra/newview/lloutputmonitorctrl.cpp
+++ b/indra/newview/lloutputmonitorctrl.cpp
@@ -278,21 +278,45 @@ BOOL LLOutputMonitorCtrl::handleMouseUp(S32 x, S32 y, MASK mask)
 
 void LLOutputMonitorCtrl::setSpeakerId(const LLUUID& speaker_id, const LLUUID& session_id/* = LLUUID::null*/, bool show_other_participants_speaking /* = false */)
 {
+	static LLUUID test_uuid("c684ce33-89fb-4544-8f7b-dae243c8b214");
+	bool test_on = (speaker_id == test_uuid);
+	if (test_on)
+	{
+		llinfos << "Merov debug : setSpeakerId, this = " << this << ", session_id = " << session_id << llendl;
+	}
 	if (speaker_id.isNull() && mSpeakerId.notNull())
 	{
 		LLSpeakingIndicatorManager::unregisterSpeakingIndicator(mSpeakerId, this);
 	}
 
-	if (speaker_id.isNull() || speaker_id == mSpeakerId) return;
+	if (speaker_id.isNull() || speaker_id == mSpeakerId) 
+	{
+		if (test_on)
+		{
+			llinfos << "Merov debug : setSpeakerId, nothing done because mSpeakerId == speaker_id" << llendl;
+		}
+		return;
+	}
 
 	if (mSpeakerId.notNull())
 	{
+		if (test_on)
+		{
+			llinfos << "Merov debug : setSpeakerId, unregisterSpeakingIndicator" << llendl;
+		}
 		// Unregister previous registration to avoid crash. EXT-4782.
-		LLSpeakingIndicatorManager::unregisterSpeakingIndicator(mSpeakerId, this);
+		if (getTargetSessionID() == session_id)
+		{
+			LLSpeakingIndicatorManager::unregisterSpeakingIndicator(mSpeakerId, this);
+		}
 	}
 
 	mShowParticipantsSpeaking = show_other_participants_speaking;
 	mSpeakerId = speaker_id;
+	if (test_on)
+	{
+		llinfos << "Merov debug : setSpeakerId, registerSpeakingIndicator" << llendl;
+	}
 	LLSpeakingIndicatorManager::registerSpeakingIndicator(mSpeakerId, this, session_id);
 
 	//mute management
@@ -320,6 +344,7 @@ void LLOutputMonitorCtrl::onChange()
 // virtual
 void LLOutputMonitorCtrl::switchIndicator(bool switch_on)
 {
+	llinfos << "Merov debug : switchIndicator, mSpeakerId = " << mSpeakerId << ", switch_on = " << switch_on << llendl;
 	// ensure indicator is visible in case it is not in visible chain
 	// to be called when parent became visible next time to notify parent that visibility is changed.
 	setVisible(TRUE);