diff options
| author | Monty Brandenberg <monty@lindenlab.com> | 2013-01-09 16:39:30 -0500 |
|---|---|---|
| committer | Monty Brandenberg <monty@lindenlab.com> | 2013-01-09 16:39:30 -0500 |
| commit | cc0a4bf6acafe759baaccea65022c963373ea012 (patch) | |
| tree | d4fe1f1e34b1ab0d140a37c1f80d09034824d3e8 /indra/newview/llfloatermap.cpp | |
| parent | 11e506f2eb979a5ddfc3ca6f9c626771ab012a78 (diff) | |
| parent | cdd45b9abb35b40f2a31e7433fb99e588df8b40b (diff) | |
Merge. Pull viewer-development in prior to filing DRTVWR merge request.
Diffstat (limited to 'indra/newview/llfloatermap.cpp')
| -rw-r--r-- | indra/newview/llfloatermap.cpp | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/indra/newview/llfloatermap.cpp b/indra/newview/llfloatermap.cpp index a65e9e911a..473e2938be 100644 --- a/indra/newview/llfloatermap.cpp +++ b/indra/newview/llfloatermap.cpp @@ -122,16 +122,13 @@ BOOL LLFloaterMap::handleDoubleClick(S32 x, S32 y, MASK mask) LLVector3d pos_global = mMap->viewPosToGlobal(x, y); - // If we're not tracking a beacon already, double-click will set one - if (!LLTracker::isTracking(NULL)) + LLTracker::stopTracking(NULL); + LLFloaterWorldMap* world_map = LLFloaterWorldMap::getInstance(); + if (world_map) { - LLFloaterWorldMap* world_map = LLFloaterWorldMap::getInstance(); - if (world_map) - { - world_map->trackLocation(pos_global); - } + world_map->trackLocation(pos_global); } - + if (gSavedSettings.getBOOL("DoubleClickTeleport")) { // If DoubleClickTeleport is on, double clicking the minimap will teleport there @@ -249,3 +246,8 @@ void LLFloaterMap::handleZoom(const LLSD& userdata) mMap->setScale(scale); } } + +LLFloaterMap* LLFloaterMap::getInstance() +{ + return LLFloaterReg::getTypedInstance<LLFloaterMap>("mini_map"); +} |