diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-04-17 02:42:27 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-04-17 02:42:27 +0000 |
| commit | d85247e63e5ff0b488211b62429a4895b48dee27 (patch) | |
| tree | 0aa2f02aeef6a8133e0d037e95ad5089b20df9eb /indra/newview/llfloatercamera.h | |
| parent | d2597d35cf3aeaf0c47a134dfe9119ef7932b98a (diff) | |
QAR-449 Viewer 1.20 RC 0
merge Branch_1-20-Viewer -r 84060 : 84432 -> release
Diffstat (limited to 'indra/newview/llfloatercamera.h')
| -rw-r--r-- | indra/newview/llfloatercamera.h | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/indra/newview/llfloatercamera.h b/indra/newview/llfloatercamera.h index fac4d2f191..6a6105f7f1 100644 --- a/indra/newview/llfloatercamera.h +++ b/indra/newview/llfloatercamera.h @@ -39,17 +39,17 @@ class LLJoystickCameraZoom; class LLJoystickCameraTrack; class LLFloaterCamera - : public LLFloater + : public LLFloater, + public LLFloaterSingleton<LLFloaterCamera> { -public: - LLFloaterCamera(const std::string& name); - ~LLFloaterCamera(); + friend class LLUISingleton<LLFloaterCamera, VisibilityPolicy<LLFloater> >; - /*virtual*/ void onClose(bool app_quitting); +private: + LLFloaterCamera(const LLSD& val); + ~LLFloaterCamera() {}; - static void show(void*); - static void toggle(void*); - static BOOL visible(void*); + /*virtual*/ void onOpen(); + /*virtual*/ void onClose(bool app_quitting); public: LLJoystickCameraRotate* mRotate; @@ -57,6 +57,4 @@ public: LLJoystickCameraTrack* mTrack; }; -extern LLFloaterCamera *gFloaterCamera; - #endif |