Second Life viewer sources 1.19.0.0

1 files changed, 8 insertions, 8 deletions

diff --git a/linden/indra/newview/lljoystickbutton.cpp b/linden/indra/newview/lljoystickbutton.cpp
index a9f7a9e..dddbea8 100644
--- a/linden/indra/newview/lljoystickbutton.cpp
+++ b/linden/indra/newview/lljoystickbutton.cpp
@@ -12,12 +12,12 @@
  * ("GPL"), unless you have obtained a separate licensing agreement
  * ("Other License"), formally executed by you and Linden Lab.  Terms of
  * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
  * 
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -607,26 +607,26 @@ void LLJoystickCameraRotate::draw()
         {
                 LLGLSUIDefault gls_ui;
 
-                gl_draw_image( 0, 0, mImageUnselected );
+                mImageUnselected->draw( 0, 0 );
 
                 if( mInTop )
                 {
-                        drawRotatedImage( mImageSelected, 0 );
+                        drawRotatedImage( mImageSelected->getImage(), 0 );
                 }
 
                 if( mInRight )
                 {
-                        drawRotatedImage( mImageSelected, 1 );
+                        drawRotatedImage( mImageSelected->getImage(), 1 );
                 }
 
                 if( mInBottom )
                 {
-                        drawRotatedImage( mImageSelected, 2 );
+                        drawRotatedImage( mImageSelected->getImage(), 2 );
                 }
 
                 if( mInLeft )
                 {
-                        drawRotatedImage( mImageSelected, 3 );
+                        drawRotatedImage( mImageSelected->getImage(), 3 );
                 }
 
                 if (sDebugRects)
@@ -801,7 +801,7 @@ void LLJoystickCameraZoom::draw()
                 }
                 else
                 {
-                        gl_draw_image( 0, 0, mImageUnselected );
+                        mImageUnselected->draw( 0, 0 );
                 }
 
                 if (sDebugRects)