diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-06-09 10:12:44 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-06-09 10:12:44 +0100 |
| commit | e24bfa78666788bc1e5179ff5d4ac3bf7d0a5491 (patch) | |
| tree | 8321dff00268a5f8783586a9e59a6dee7b50e2aa /indra/newview/lljoystickbutton.h | |
| parent | 275581a3855f7c9c593ad314dfa386ceb952169c (diff) | |
| parent | ae43801f44d6c1c23bb6aea17452c7ddcdec65a3 (diff) | |
merge from PE's viewer-release
Diffstat (limited to 'indra/newview/lljoystickbutton.h')
| -rw-r--r-- | indra/newview/lljoystickbutton.h | 40 |
1 files changed, 0 insertions, 40 deletions
diff --git a/indra/newview/lljoystickbutton.h b/indra/newview/lljoystickbutton.h index 2b071a8999..1dd30036ab 100644 --- a/indra/newview/lljoystickbutton.h +++ b/indra/newview/lljoystickbutton.h @@ -183,44 +183,4 @@ public: virtual void onHeldDown(); }; - -// Zoom the camera in and out -class LLJoystickCameraZoom -: public LLJoystick -{ -public: - struct Params - : public LLInitParam::Block<Params, LLJoystick::Params> - { - Optional<LLUIImage*> plus_image; - Optional<LLUIImage*> minus_image; - - Params() - : plus_image ("plus_image", NULL), - minus_image ("minus_image", NULL) - { - held_down_delay.seconds(0.0); - } - }; - LLJoystickCameraZoom(const Params&); - - virtual void setToggleState( BOOL top, BOOL bottom ); - - virtual BOOL handleMouseDown(S32 x, S32 y, MASK mask); - virtual void onHeldDown(); - virtual void draw(); - -protected: - virtual void updateSlop(); - F32 getOrbitRate(); - -protected: - BOOL mInTop; - BOOL mInBottom; - LLUIImagePtr mPlusInImage; - LLUIImagePtr mMinusInImage; -}; - - - #endif // LL_LLJOYSTICKBUTTON_H |