Implemented #456: added option to disable objects in mini-map from emerald (I placed it in the right click menu instead of as a debug setting. There are a few other options that might be nice to have in there as well, such as physical)

1 files changed, 12 insertions, 1 deletions

diff --git a/linden/indra/newview/llnetmap.h b/linden/indra/newview/llnetmap.h
index c0c19d5..562ebc6 100644
--- a/linden/indra/newview/llnetmap.h
+++ b/linden/indra/newview/llnetmap.h
@@ -118,7 +118,6 @@ private:
         LLUUID                          mClosestAgentToCursor;
         LLUUID                          mClosestAgentAtLastRightClick;
 
-        static BOOL             sRotateMap;
         static LLNetMap*        sInstance;
         static BOOL isAgentUnderCursor(void*) { return sInstance && sInstance->mClosestAgentToCursor.notNull(); }
         static BOOL outsideSlop(S32 x, S32 y, S32 start_x, S32 start_y);
@@ -156,6 +155,18 @@ private:
                 /*virtual*/ bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata);
         };
 
+        class LLShowObjects : public LLMemberListener<LLNetMap>
+        {
+        public:
+                /*virtual*/ bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata);
+        };
+
+        class LLCheckShowObjects : public LLMemberListener<LLNetMap>
+        {
+        public:
+                /*virtual*/ bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata);
+        };
+
         class LLShowWorldMap : public LLMemberListener<LLNetMap>
         {
         public: