summaryrefslogtreecommitdiff
path: root/indra/newview/lloutputmonitorctrl.h
diff options
context:
space:
mode:
authorRick Pasetto <rick@lindenlab.com>2009-11-04 16:13:07 -0800
committerRick Pasetto <rick@lindenlab.com>2009-11-04 16:13:07 -0800
commite1c5abce9309a89bd9993264bca8dadadf882c6f (patch)
tree81e1f91811b207abd4dfe4c82db31583d92df212 /indra/newview/lloutputmonitorctrl.h
parent33eac5dc0a1dfc0624dcfc75bec35155fbb9c917 (diff)
parent0bd2567bf5648808a95c7826581199bb371597cb (diff)
merge with remote repo
Diffstat (limited to 'indra/newview/lloutputmonitorctrl.h')
-rw-r--r--indra/newview/lloutputmonitorctrl.h3
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;