Added 'Show Map' option to the mini-map menu

4 files changed, 26 insertions, 0 deletions

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 9e73131..b174987 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,12 @@
+2009-06-13  McCabe Maxsted  <hakushakukun@gmail.com>
+
+        * Added 'Show Map' option to the mini-map menu.
+
+                modified:   linden/indra/newview/llnetmap.cpp
+                modified:   linden/indra/newview/llnetmap.h
+                modified:   linden/indra/newview/skins/default/xui/en-us/menu_mini_map.xml
+
+
 2009-06-12  McCabe Maxsted  <hakushakukun@gmail.com>
 
         * Applied patch by Robin Cornelius for VWR-12686:
diff --git a/linden/indra/newview/llnetmap.cpp b/linden/indra/newview/llnetmap.cpp
index 585e8eb..85b0f28 100644
--- a/linden/indra/newview/llnetmap.cpp
+++ b/linden/indra/newview/llnetmap.cpp
@@ -96,6 +96,7 @@ LLNetMap::LLNetMap(const std::string& name) :
         (new LLScaleMap())->registerListener(this, "MiniMap.ZoomLevel");
         (new LLCenterMap())->registerListener(this, "MiniMap.Center");
         (new LLCheckCenterMap())->registerListener(this, "MiniMap.CheckCenter");
+        (new LLShowWorldMap())->registerListener(this, "MiniMap.ShowWorldMap");
         (new LLStopTracking())->registerListener(this, "MiniMap.StopTracking");
         (new LLEnableTracking())->registerListener(this, "MiniMap.EnableTracking");
         (new LLShowAgentProfile())->registerListener(this, "MiniMap.ShowProfile");
@@ -902,6 +903,12 @@ bool LLNetMap::LLCheckCenterMap::handleEvent(LLPointer<LLEvent> event, const LLS
         return true;
 }
 
+bool LLNetMap::LLShowWorldMap::handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+{
+        LLFloaterWorldMap::show(NULL, FALSE);
+        return true;
+}
+
 bool LLNetMap::LLStopTracking::handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
 {
         LLTracker::stopTracking(NULL);
diff --git a/linden/indra/newview/llnetmap.h b/linden/indra/newview/llnetmap.h
index 508e882..ef046d8 100644
--- a/linden/indra/newview/llnetmap.h
+++ b/linden/indra/newview/llnetmap.h
@@ -140,6 +140,12 @@ private:
                 /*virtual*/ bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata);
         };
 
+        class LLShowWorldMap : public LLMemberListener<LLNetMap>
+        {
+        public:
+                /*virtual*/ bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata);
+        };
+
         class LLStopTracking : public LLMemberListener<LLNetMap>
         {
         public:
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_mini_map.xml b/linden/indra/newview/skins/default/xui/en-us/menu_mini_map.xml
index 68eb4e6..485ae9f 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_mini_map.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_mini_map.xml
@@ -20,6 +20,10 @@
     <on_check function="MiniMap.CheckCenter" userdata="1" />
   </menu_item_check>
   <menu_item_separator />
+  <menu_item_call bottom_delta="-18" enabled = "false" height="18" label="Show Map"
+                 left="0" mouse_opaque="true" name="Show Map" width="128">
+    <on_click function="MiniMap.ShowWorldMap" userdata="" />
+  </menu_item_call>
         <menu_item_call bottom_delta="-18" enabled = "false" height="18" label="Stop Tracking"
                  left="0" mouse_opaque="true" name="Stop Tracking" width="128">
                 <on_click function="MiniMap.StopTracking" />