From b31a6d0a43c2041c04ebe09c88f6ab3d10a5129a Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Sat, 13 Jun 2009 01:54:12 -0700
Subject: Added 'Show Map' option to the mini-map menu

---
 linden/indra/newview/llnetmap.cpp                              | 7 +++++++
 linden/indra/newview/llnetmap.h                                | 6 ++++++
 linden/indra/newview/skins/default/xui/en-us/menu_mini_map.xml | 4 ++++
 3 files changed, 17 insertions(+)

(limited to 'linden/indra')

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" />
-- 
cgit v1.1