summaryrefslogtreecommitdiff
path: root/indra/newview/lloutputmonitorctrl.h
diff options
context:
space:
mode:
authormaxim_productengine <mnikolenko@productengine.com>2019-03-22 17:31:26 +0200
committermaxim_productengine <mnikolenko@productengine.com>2019-03-22 17:31:26 +0200
commite4b499e64d63dbcdb97590f86d533f6877690b84 (patch)
tree399f16cfdb3fa410275ac07cdd9651b7051b165b /indra/newview/lloutputmonitorctrl.h
parent01f696b85ec09ede4bc2e9b085a10a194e9d9259 (diff)
SL-10780 FIXED Speaker icon is shown for all friends
Diffstat (limited to 'indra/newview/lloutputmonitorctrl.h')
-rw-r--r--indra/newview/lloutputmonitorctrl.h11
1 files changed, 10 insertions, 1 deletions
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<LLUIImage> mImageMute;
LLPointer<LLUIImage> mImageOff;
@@ -155,6 +162,8 @@ private:
LLUUID mSpeakerId;
bool mIndicatorToggled;
+
+ EChannelState mChannelState;
};
#endif