Second Life viewer sources 1.20.2

1 files changed, 13 insertions, 45 deletions

diff --git a/linden/indra/newview/llcameraview.h b/linden/indra/newview/llfloatercamera.h
index ebe3cc6..df90e77 100644
--- a/linden/indra/newview/llcameraview.h
+++ b/linden/indra/newview/llfloatercamera.h
@@ -1,6 +1,6 @@
 /** 
- * @file llcameraview.h
- * @brief Container for buttons for walking, turning, flying
+ * @file llfloatercamera.h
+ * @brief Container for camera control buttons (zoom, pan, orbit)
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
@@ -29,64 +29,32 @@
  * $/LicenseInfo$
  */
 
-// llcameraview.h
-//
-// Copyright 2001-2003, Linden Reserach, Inc.
-// 
+#ifndef LLFLOATERCAMERA_H
+#define LLFLOATERCAMERA_H
 
-#ifndef LL_LLCAMERAVIEW_H
-#define LL_LLCAMERAVIEW_H
-
-// Library includes
 #include "llfloater.h"
-#include "llstatview.h"
 
 class LLJoystickCameraRotate;
 class LLJoystickCameraZoom;
 class LLJoystickCameraTrack;
 
-//
-// Classes
-//
 class LLFloaterCamera
-:       public LLFloater
+        :       public LLFloater,
+                public LLFloaterSingleton<LLFloaterCamera>
 {
-public:
-        LLFloaterCamera(const std::string& name);
-        ~LLFloaterCamera();
-
+        friend class LLUISingleton<LLFloaterCamera, VisibilityPolicy<LLFloater> >;
+        
+private:
+        LLFloaterCamera(const LLSD& val);
+        ~LLFloaterCamera() {};
+        
+        /*virtual*/ void onOpen();
         /*virtual*/ void onClose(bool app_quitting);
         
-        static void show(void*);
-        static void toggle(void*);
-        static BOOL visible(void*);
-
 public:
         LLJoystickCameraRotate* mRotate;
         LLJoystickCameraZoom*   mZoom;
         LLJoystickCameraTrack*  mTrack;
 };
 
-class LLFloaterJoystick
-:       public LLFloater
-{
-protected:
-        LLFloaterJoystick();
-        ~LLFloaterJoystick();
-
-public:
-        static void             show(void*);
-        static LLFloaterJoystick* getInstance();
-        static BOOL             visible(void*);
-        virtual void draw();
-        
-protected:
-        static LLFloaterJoystick*       sInstance;
-        LLStatView*             mAxisStats;
-        LLStat*                 mAxis[8];
-        LLStatBar*              mAxisBar[8];
-};
-
-extern LLFloaterCamera *gFloaterCamera;
-
 #endif