Merged 1.2.0-radar2 into 1.2.0-next

1 files changed, 16 insertions, 2 deletions

diff --git a/linden/indra/newview/llnetmap.h b/linden/indra/newview/llnetmap.h
index ef046d8..55fbe1f 100644
--- a/linden/indra/newview/llnetmap.h
+++ b/linden/indra/newview/llnetmap.h
@@ -52,6 +52,8 @@ class LLNetMap : public LLPanel
 {
 public:
         LLNetMap(const std::string& name);
+
+        virtual BOOL postBuild();
         virtual ~LLNetMap();
 
         virtual void    draw();
@@ -111,8 +113,8 @@ private:
         LLPointer<LLImageGL>    mObjectImagep;
 
 private:
-        LLUUID                  mClosestAgentToCursor;
-        LLUUID                  mClosestAgentAtLastRightClick;
+        LLUUID                          mClosestAgentToCursor;
+        LLUUID                          mClosestAgentAtLastRightClick;
 
         static BOOL             sRotateMap;
         static LLNetMap*        sInstance;
@@ -140,6 +142,18 @@ private:
                 /*virtual*/ bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata);
         };
 
+        class LLRotateMap : public LLMemberListener<LLNetMap>
+        {
+        public:
+                /*virtual*/ bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata);
+        };
+
+        class LLCheckRotateMap : public LLMemberListener<LLNetMap>
+        {
+        public:
+                /*virtual*/ bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata);
+        };
+
         class LLShowWorldMap : public LLMemberListener<LLNetMap>
         {
         public: