diff options
| author | Dmitry Zaporozhan <dzaporozhan@productengine.com> | 2009-11-16 12:33:52 +0200 |
|---|---|---|
| committer | Dmitry Zaporozhan <dzaporozhan@productengine.com> | 2009-11-16 12:33:52 +0200 |
| commit | 471897cfabbfec8d4dbee65c837d5884310ea61a (patch) | |
| tree | d9ef29f52786b380bd3d496c1f5a258aefeeb772 /indra/newview/llfloatercamera.h | |
| parent | d149b28173c2b255bd1bf1db902368dfbdf3064a (diff) | |
| parent | e7519e8a977138627b429ca43a10184c82efc66e (diff) | |
Merge
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llfloatercamera.h')
| -rw-r--r-- | indra/newview/llfloatercamera.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llfloatercamera.h b/indra/newview/llfloatercamera.h index 583f279e62..4873a34e00 100644 --- a/indra/newview/llfloatercamera.h +++ b/indra/newview/llfloatercamera.h @@ -39,6 +39,7 @@ class LLJoystickCameraRotate; class LLJoystickCameraZoom; class LLJoystickCameraTrack; class LLFloaterReg; +class LLPanelCameraZoom; enum ECameraControlMode { @@ -74,7 +75,7 @@ public: virtual void onClose(bool app_quitting); LLJoystickCameraRotate* mRotate; - LLJoystickCameraZoom* mZoom; + LLPanelCameraZoom* mZoom; LLJoystickCameraTrack* mTrack; private: |