aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llnetmap.cpp
diff options
context:
space:
mode:
authorMcCabe Maxsted2009-06-13 01:54:12 -0700
committerMcCabe Maxsted2009-06-13 01:54:12 -0700
commitb31a6d0a43c2041c04ebe09c88f6ab3d10a5129a (patch)
treea6e90e2bca58b6b57abdc45b7ab5ad8742929a3d /linden/indra/newview/llnetmap.cpp
parentApplied Aimee's patch for VWR-13221: Allow panning of the mini-map (diff)
downloadmeta-impy-b31a6d0a43c2041c04ebe09c88f6ab3d10a5129a.zip
meta-impy-b31a6d0a43c2041c04ebe09c88f6ab3d10a5129a.tar.gz
meta-impy-b31a6d0a43c2041c04ebe09c88f6ab3d10a5129a.tar.bz2
meta-impy-b31a6d0a43c2041c04ebe09c88f6ab3d10a5129a.tar.xz
Added 'Show Map' option to the mini-map menu
Diffstat (limited to 'linden/indra/newview/llnetmap.cpp')
-rw-r--r--linden/indra/newview/llnetmap.cpp7
1 files changed, 7 insertions, 0 deletions
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) :
96 (new LLScaleMap())->registerListener(this, "MiniMap.ZoomLevel"); 96 (new LLScaleMap())->registerListener(this, "MiniMap.ZoomLevel");
97 (new LLCenterMap())->registerListener(this, "MiniMap.Center"); 97 (new LLCenterMap())->registerListener(this, "MiniMap.Center");
98 (new LLCheckCenterMap())->registerListener(this, "MiniMap.CheckCenter"); 98 (new LLCheckCenterMap())->registerListener(this, "MiniMap.CheckCenter");
99 (new LLShowWorldMap())->registerListener(this, "MiniMap.ShowWorldMap");
99 (new LLStopTracking())->registerListener(this, "MiniMap.StopTracking"); 100 (new LLStopTracking())->registerListener(this, "MiniMap.StopTracking");
100 (new LLEnableTracking())->registerListener(this, "MiniMap.EnableTracking"); 101 (new LLEnableTracking())->registerListener(this, "MiniMap.EnableTracking");
101 (new LLShowAgentProfile())->registerListener(this, "MiniMap.ShowProfile"); 102 (new LLShowAgentProfile())->registerListener(this, "MiniMap.ShowProfile");
@@ -902,6 +903,12 @@ bool LLNetMap::LLCheckCenterMap::handleEvent(LLPointer<LLEvent> event, const LLS
902 return true; 903 return true;
903} 904}
904 905
906bool LLNetMap::LLShowWorldMap::handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
907{
908 LLFloaterWorldMap::show(NULL, FALSE);
909 return true;
910}
911
905bool LLNetMap::LLStopTracking::handleEvent(LLPointer<LLEvent> event, const LLSD& userdata) 912bool LLNetMap::LLStopTracking::handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
906{ 913{
907 LLTracker::stopTracking(NULL); 914 LLTracker::stopTracking(NULL);