From 34398aac4b269a8c5d531fd45e48ece366f58b07 Mon Sep 17 00:00:00 2001
From: James Cook <james@lindenlab.com>
Date: Tue, 27 Oct 2009 15:00:36 -0700
Subject: Use consistent LLPointer<LLUIImage> return values for buttons. 
 Reviewed with Richard.

---
 indra/llui/llbutton.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/llui/llbutton.h')

diff --git a/indra/llui/llbutton.h b/indra/llui/llbutton.h
index 7fc4997133..5e2aea2b74 100644
--- a/indra/llui/llbutton.h
+++ b/indra/llui/llbutton.h
@@ -241,8 +241,8 @@ public:
 	void		setForcePressedState(BOOL b) { mForcePressedState = b; }
 	
 protected:
-	const LLPointer<LLUIImage>&	getImageUnselected() const	{ return mImageUnselected; }
-	const LLPointer<LLUIImage>& getImageSelected() const	{ return mImageSelected; }
+	LLPointer<LLUIImage> getImageUnselected() const	{ return mImageUnselected; }
+	LLPointer<LLUIImage> getImageSelected() const	{ return mImageSelected; }
 
 	LLFrameTimer	mMouseDownTimer;
 
-- 
cgit v1.2.3


From 07749af3871420b9f4542e288da4372cdf2d2513 Mon Sep 17 00:00:00 2001
From: angela <angela@lindenlab.com>
Date: Thu, 29 Oct 2009 16:28:04 +0800
Subject: EXT-1954 Implement Inspector Info i rollover icon

---
 indra/llui/llbutton.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra/llui/llbutton.h')

diff --git a/indra/llui/llbutton.h b/indra/llui/llbutton.h
index 7fc4997133..839b196466 100644
--- a/indra/llui/llbutton.h
+++ b/indra/llui/llbutton.h
@@ -176,6 +176,7 @@ public:
 	BOOL			getToggleState() const;
 	void			setToggleState(BOOL b);
 
+	void			setHighlight(bool b);
 	void			setFlashing( BOOL b );
 	BOOL			getFlashing() const		{ return mFlashing; }
 
-- 
cgit v1.2.3