From abdc99f21b542c4fea67030ddbd7166c9d1c6c63 Mon Sep 17 00:00:00 2001
From: Brad Kittenbrink <brad@lindenlab.com>
Date: Wed, 18 Feb 2009 21:10:16 +0000
Subject: Merge of QAR-1267 to trunk.  This was a combo merge of QAR-1175
 (maint-render-9) and QAR-1236 (dll-msvcrt-2)

svn merge -r 109838:112264 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-render/maint-render-9-merge-r109833
---
 indra/newview/lljoystickbutton.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/indra/newview/lljoystickbutton.h b/indra/newview/lljoystickbutton.h
index e7d4beb375..076a506f14 100644
--- a/indra/newview/lljoystickbutton.h
+++ b/indra/newview/lljoystickbutton.h
@@ -134,7 +134,7 @@ public:
 protected:
 	F32				getOrbitRate();
 	virtual void	updateSlop();
-	void			drawRotatedImage( const LLImageGL* image, S32 rotations );
+	void			drawRotatedImage( LLImageGL* image, S32 rotations );
 
 protected:
 	BOOL			mInLeft;
-- 
cgit v1.2.3