diff options
author | Rick Pasetto <rick@lindenlab.com> | 2009-11-05 17:50:32 -0800 |
---|---|---|
committer | Rick Pasetto <rick@lindenlab.com> | 2009-11-05 17:50:32 -0800 |
commit | 8c44fac93ffce1a41d84f1d6e98891a50ab1dbab (patch) | |
tree | aca14bb3256b6dd4c1a7a342d36f2cc989159f41 /indra/newview/lljoystickbutton.h | |
parent | 1712265901da8ba65f2a9ae3e903372fafacd268 (diff) | |
parent | e654475529d924603a9b3bc8c4775c86d3cf7933 (diff) |
merge from remote repo
Diffstat (limited to 'indra/newview/lljoystickbutton.h')
-rw-r--r-- | indra/newview/lljoystickbutton.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/lljoystickbutton.h b/indra/newview/lljoystickbutton.h index 8caef30fa4..4c657913b8 100644 --- a/indra/newview/lljoystickbutton.h +++ b/indra/newview/lljoystickbutton.h @@ -150,7 +150,7 @@ public: protected: F32 getOrbitRate(); virtual void updateSlop(); - void drawRotatedImage( LLTexture* image, S32 rotations ); + void drawRotatedImage( LLPointer<LLUIImage> image, S32 rotations ); protected: BOOL mInLeft; |