From f7f15900ea4c61c499427a8b6416dc08e9a972f7 Mon Sep 17 00:00:00 2001
From: Paul ProductEngine <pguslisty@productengine.com>
Date: Thu, 27 Sep 2012 17:46:11 +0300
Subject: CHUI-346 ADDITIONAL FIX (LLConversationViewSession: enable current
 voice channel indicator)

- When voice initialized show voice channel indicator for nearby chat session
---
 indra/newview/lloutputmonitorctrl.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'indra/newview/lloutputmonitorctrl.h')

diff --git a/indra/newview/lloutputmonitorctrl.h b/indra/newview/lloutputmonitorctrl.h
index 44d4d6f64b..1fa6ef41f8 100644
--- a/indra/newview/lloutputmonitorctrl.h
+++ b/indra/newview/lloutputmonitorctrl.h
@@ -82,7 +82,7 @@ public:
 
 	void			setIsTalking(bool val) { mIsTalking = val; }
 
-	void			setShowParticipantsTalking(bool show) { mShowParticipantsTalking = show; }
+	void			setShowParticipantsSpeaking(bool show) { mShowParticipantsSpeaking = show; }
 
 	/**
 	 * Sets avatar UUID to interact with voice channel.
@@ -92,7 +92,7 @@ public:
 	 *		If this parameter is set registered indicator will be shown only in voice channel
 	 *		which has the same session id (EXT-5562).
 	 */
-	void			setSpeakerId(const LLUUID& speaker_id, const LLUUID& session_id = LLUUID::null);
+	void			setSpeakerId(const LLUUID& speaker_id, const LLUUID& session_id = LLUUID::null, bool show_other_participants_speaking = false);
 
 	//called by mute list
 	virtual void onChange();
@@ -134,7 +134,7 @@ private:
 	bool			mIsAgentControl;
 	bool			mIsMuted;
 	bool			mIsTalking;
-	bool			mShowParticipantsTalking;
+	bool			mShowParticipantsSpeaking;
 	LLPointer<LLUIImage> mImageMute;
 	LLPointer<LLUIImage> mImageOff;
 	LLPointer<LLUIImage> mImageOn;
-- 
cgit v1.2.3