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 +++++++
 1 file changed, 7 insertions(+)

(limited to 'linden/indra/newview/llnetmap.cpp')

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);
-- 
cgit v1.1