From 3a8053eb9fc0db52b9fb5ae02f1807acbb4e072d Mon Sep 17 00:00:00 2001 From: andreykproductengine Date: Mon, 11 Feb 2019 19:01:28 +0200 Subject: SL-10351 Fixed Avatars muted by Group moderator become Blocked forever --- indra/newview/lloutputmonitorctrl.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'indra/newview/lloutputmonitorctrl.h') diff --git a/indra/newview/lloutputmonitorctrl.h b/indra/newview/lloutputmonitorctrl.h index 0682af1278..af52a81b04 100644 --- a/indra/newview/lloutputmonitorctrl.h +++ b/indra/newview/lloutputmonitorctrl.h @@ -72,7 +72,10 @@ public: void setPower(F32 val); F32 getPower(F32 val) const { return mPower; } - + + bool getIsMuted() const { return (mIsMuted || mIsModeratorMuted); } + void setIsModeratorMuted(bool val) { mIsModeratorMuted = val; } + // For the current user, need to know the PTT state to show // correct button image. void setIsAgentControl(bool val) { mIsAgentControl = val; } @@ -131,6 +134,7 @@ private: F32 mPower; bool mIsAgentControl; + bool mIsModeratorMuted; bool mIsMuted; bool mIsTalking; bool mShowParticipantsSpeaking; -- cgit v1.2.3 From 3b3e4833ad41993785ea2fcae651b588df8e492d Mon Sep 17 00:00:00 2001 From: andreykproductengine Date: Tue, 5 Mar 2019 20:14:21 +0200 Subject: SL-10686 Refresh indicators on session change, fix visibility --- indra/newview/lloutputmonitorctrl.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'indra/newview/lloutputmonitorctrl.h') diff --git a/indra/newview/lloutputmonitorctrl.h b/indra/newview/lloutputmonitorctrl.h index af52a81b04..307cd30ab3 100644 --- a/indra/newview/lloutputmonitorctrl.h +++ b/indra/newview/lloutputmonitorctrl.h @@ -79,9 +79,11 @@ public: // For the current user, need to know the PTT state to show // correct button image. void setIsAgentControl(bool val) { mIsAgentControl = val; } - void setIsTalking(bool val) { mIsTalking = val; } + // switchIndicator controls visibility, 'active channel' governs if we are allowed to show indicator + void setIsActiveChannel(bool val); + void setShowParticipantsSpeaking(bool show) { mShowParticipantsSpeaking = show; } /** @@ -137,6 +139,7 @@ private: bool mIsModeratorMuted; bool mIsMuted; bool mIsTalking; + bool mIsActiveChannel; bool mShowParticipantsSpeaking; LLPointer mImageMute; LLPointer mImageOff; -- cgit v1.2.3 From bce1630e269c0f39f9fa9a5e0840154da6b0d727 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.2.3