diff options
| author | Bryan O'Sullivan <bos@lindenlab.com> | 2009-11-04 14:59:23 -0800 |
|---|---|---|
| committer | Bryan O'Sullivan <bos@lindenlab.com> | 2009-11-04 14:59:23 -0800 |
| commit | b806edf4ac47d18e1a43fb8dbb5fbcad8d13192f (patch) | |
| tree | 26640bea40cb3913ab9d30ac99eeec936679a5ff /indra/newview/lloutputmonitorctrl.h | |
| parent | 8b4818430fc120443b9dc677ae10fd072fffb6e6 (diff) | |
Redo Bao's broken merge
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 7a7b8bc3a1..85ea552a57 100644 --- a/indra/newview/lloutputmonitorctrl.h +++ b/indra/newview/lloutputmonitorctrl.h @@ -81,6 +81,8 @@ 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; } void setSpeakerId(const LLUUID& speaker_id); @@ -100,6 +102,7 @@ private: F32 mPower; + bool mIsAgentControl; bool mIsMuted; bool mIsTalking; LLPointer<LLUIImage> mImageMute; |