From eb853f55c07ae4a3c3f2aa05fbabcf2e4b4dc115 Mon Sep 17 00:00:00 2001
From: Richard Nelson <richard@lindenlab.com>
Date: Tue, 4 Aug 2009 01:12:59 +0000
Subject: svn merge -r 128442:129343
 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-18 into
 svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3

---
 indra/newview/lloutputmonitorctrl.h | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'indra/newview/lloutputmonitorctrl.h')

diff --git a/indra/newview/lloutputmonitorctrl.h b/indra/newview/lloutputmonitorctrl.h
index e391c14e40..98b2fe9dc6 100644
--- a/indra/newview/lloutputmonitorctrl.h
+++ b/indra/newview/lloutputmonitorctrl.h
@@ -76,6 +76,10 @@ public:
 	bool			getIsMuted() const { return mIsMuted; }
 	void			setIsMuted(bool val) { mIsMuted = val; }
 
+	// For the current user, need to know the PTT state to show
+	// correct button image.
+	void			setIsTalking(bool val) { mIsTalking = val; }
+
 private:
 	//static LLColor4	sColorMuted;
 	//static LLColor4	sColorNormal;
@@ -87,6 +91,7 @@ private:
 	
 	F32				mPower;
 	bool			mIsMuted;
+	bool			mIsTalking;
 	LLPointer<LLUIImage> mImageMute;
 	LLPointer<LLUIImage> mImageOff;
 	LLPointer<LLUIImage> mImageOn;
-- 
cgit v1.2.3