diff options
author | Yuri Chebotarev <ychebotarev@productengine.com> | 2009-11-13 12:59:04 +0200 |
---|---|---|
committer | Yuri Chebotarev <ychebotarev@productengine.com> | 2009-11-13 12:59:04 +0200 |
commit | a569421eca9efb9eb796a1322a961b6aac05cc27 (patch) | |
tree | b8675b965c81413155fb26e36ad5a81b6877cd4a /indra/newview/llfloatercamera.h | |
parent | bed508f9ef3bce8fb67669ab60b01cd4119a7f76 (diff) | |
parent | eb1484a0c9b6a075c900371cc5d7e8c4c0a4f93f (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: |