diff options
author | Graham Linden <graham@lindenlab.com> | 2019-05-08 17:38:13 -0700 |
---|---|---|
committer | Graham Linden <graham@lindenlab.com> | 2019-05-08 17:38:13 -0700 |
commit | cd6044ed7a52e68e6050130ac2e9a637b8b7f339 (patch) | |
tree | 2295f1b2afce6815aec4b80ff447d65de31a67b4 /indra/newview/lloutputmonitorctrl.h | |
parent | 22fc3409f4606459c6df219c343a002fc53a35cd (diff) | |
parent | 42fa05bd4cd8d587af4c216faca5e8c010812c8b (diff) |
Merge viewer-release 6.2.2
Diffstat (limited to 'indra/newview/lloutputmonitorctrl.h')
-rw-r--r-- | indra/newview/lloutputmonitorctrl.h | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/indra/newview/lloutputmonitorctrl.h b/indra/newview/lloutputmonitorctrl.h index 0682af1278..98966d39ee 100644 --- a/indra/newview/lloutputmonitorctrl.h +++ b/indra/newview/lloutputmonitorctrl.h @@ -72,13 +72,26 @@ 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; } - 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; } /** @@ -131,6 +144,7 @@ private: F32 mPower; bool mIsAgentControl; + bool mIsModeratorMuted; bool mIsMuted; bool mIsTalking; bool mShowParticipantsSpeaking; @@ -148,6 +162,8 @@ private: LLUUID mSpeakerId; bool mIndicatorToggled; + + EChannelState mChannelState; }; #endif |