diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-09-26 17:17:31 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-09-26 17:17:31 -0700 |
| commit | c92a83fe01f2201361f2f3b9770308aac00093e8 (patch) | |
| tree | ec199de8c835f8b1c7d5f61659b9707fa7d252c7 /indra/newview/lloutputmonitorctrl.h | |
| parent | 9e1ea5a1652528dead811dee8904ae8a6833d163 (diff) | |
| parent | 976a2f5a442150ef89cff6b39450eabbca956d0f (diff) | |
Pull merge from richard/viewer-chui
Diffstat (limited to 'indra/newview/lloutputmonitorctrl.h')
| -rw-r--r-- | indra/newview/lloutputmonitorctrl.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/lloutputmonitorctrl.h b/indra/newview/lloutputmonitorctrl.h index 7b02e84744..44d4d6f64b 100644 --- a/indra/newview/lloutputmonitorctrl.h +++ b/indra/newview/lloutputmonitorctrl.h @@ -82,6 +82,8 @@ public: void setIsTalking(bool val) { mIsTalking = val; } + void setShowParticipantsTalking(bool show) { mShowParticipantsTalking = show; } + /** * Sets avatar UUID to interact with voice channel. * @@ -132,6 +134,7 @@ private: bool mIsAgentControl; bool mIsMuted; bool mIsTalking; + bool mShowParticipantsTalking; LLPointer<LLUIImage> mImageMute; LLPointer<LLUIImage> mImageOff; LLPointer<LLUIImage> mImageOn; |