Second Life viewer sources 1.23.0-RC

1 files changed, 13 insertions, 18 deletions

diff --git a/linden/indra/newview/llfloatermap.h b/linden/indra/newview/llfloatermap.h
index 91226dd..ec2db27 100644
--- a/linden/indra/newview/llfloatermap.h
+++ b/linden/indra/newview/llfloatermap.h
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -36,32 +37,26 @@
 
 class LLNetMap;
 
-//
-// Classes
-//
-class LLFloaterMap
-:       public LLFloater
+class LLFloaterMap :
+        public LLFloater,
+        public LLFloaterSingleton<LLFloaterMap>
 {
+        friend class LLUISingleton<LLFloaterMap, VisibilityPolicy<LLFloater> >;
 public:
-        LLFloaterMap(const std::string& name);
         virtual ~LLFloaterMap();
 
-        static void             toggle(void*);
+        static void* createPanelMiniMap(void* data);
+
+        BOOL postBuild();
 
-        /*virtual*/ void        setVisible(BOOL visible);
         /*virtual*/ void        draw();
+        /*virtual*/ void        onOpen();
         /*virtual*/ void        onClose(bool app_quitting);
         /*virtual*/ BOOL        canClose();
 
-protected:
-        LLNetMap*               mMap;
+private:
+        LLFloaterMap(const LLSD& key = LLSD());
+        LLNetMap*               mPanelMap;
 };
 
-
-//
-// Globals
-//
-
-extern LLFloaterMap *gFloaterMap;
-
 #endif  // LL_LLFLOATERMAP_H