summaryrefslogtreecommitdiff
path: root/indra/newview/lloutputmonitorctrl.h
diff options
context:
space:
mode:
authorAndreyL ProductEngine <alihatskiy@productengine.com>2019-03-14 20:00:04 +0200
committerAndreyL ProductEngine <alihatskiy@productengine.com>2019-03-14 20:00:04 +0200
commit671a42595cc927df821441431360120beabc2eda (patch)
tree022f1cbcdc4f62a28c9a59ce4e464ce118a49cb6 /indra/newview/lloutputmonitorctrl.h
parenteed5671681cc508fe0f06b06018e5a14894d4f32 (diff)
parent422b2c5e330ecb1fd7c9055403444a9e5fc5926c (diff)
Merged in lindenlab/viewer-bear
Diffstat (limited to 'indra/newview/lloutputmonitorctrl.h')
-rw-r--r--indra/newview/lloutputmonitorctrl.h5
1 files changed, 4 insertions, 1 deletions
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<LLUIImage> mImageMute;
LLPointer<LLUIImage> mImageOff;