Backported 1.23's minimap conversion to XUI

1 files changed, 11 insertions, 17 deletions

diff --git a/linden/indra/newview/llfloatermap.h b/linden/indra/newview/llfloatermap.h
index 91226dd..dd1cba8 100644
--- a/linden/indra/newview/llfloatermap.h
+++ b/linden/indra/newview/llfloatermap.h
@@ -36,32 +36,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