From e4b499e64d63dbcdb97590f86d533f6877690b84 Mon Sep 17 00:00:00 2001 From: maxim_productengine Date: Fri, 22 Mar 2019 17:31:26 +0200 Subject: SL-10780 FIXED Speaker icon is shown for all friends --- indra/newview/lloutputmonitorctrl.h | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'indra/newview/lloutputmonitorctrl.h') diff --git a/indra/newview/lloutputmonitorctrl.h b/indra/newview/lloutputmonitorctrl.h index 307cd30ab3..98966d39ee 100644 --- a/indra/newview/lloutputmonitorctrl.h +++ b/indra/newview/lloutputmonitorctrl.h @@ -81,8 +81,16 @@ public: void setIsAgentControl(bool val) { mIsAgentControl = val; } void setIsTalking(bool val) { mIsTalking = val; } + enum EChannelState + { + ACTIVE_CHANNEL, + INACTIVE_CHANNEL, + UNDEFINED_CHANNEL + }; + // switchIndicator controls visibility, 'active channel' governs if we are allowed to show indicator void setIsActiveChannel(bool val); + void setChannelState(EChannelState state); void setShowParticipantsSpeaking(bool show) { mShowParticipantsSpeaking = show; } @@ -139,7 +147,6 @@ private: bool mIsModeratorMuted; bool mIsMuted; bool mIsTalking; - bool mIsActiveChannel; bool mShowParticipantsSpeaking; LLPointer mImageMute; LLPointer mImageOff; @@ -155,6 +162,8 @@ private: LLUUID mSpeakerId; bool mIndicatorToggled; + + EChannelState mChannelState; }; #endif -- cgit v1.3