diff options
| author | Igor Borovkov <iborovkov@productengine.com> | 2009-11-13 12:06:52 +0200 |
|---|---|---|
| committer | Igor Borovkov <iborovkov@productengine.com> | 2009-11-13 12:06:52 +0200 |
| commit | 1db5d35447478a74ece447297289d76bfef8c48c (patch) | |
| tree | db0b8f78344aee6ed21efd4444908c8c8d0fc7a5 /indra/newview/llfloatercamera.h | |
| parent | 4d616fdfaebca4aedce84f5d694dcd495ac4222c (diff) | |
| parent | 74d5a6605bac7ae76889ce3697fc8f59d982d675 (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: |