diff options
| author | maxim_productengine <mnikolenko@productengine.com> | 2012-08-08 17:55:04 +0300 |
|---|---|---|
| committer | maxim_productengine <mnikolenko@productengine.com> | 2012-08-08 17:55:04 +0300 |
| commit | ba7e1ec1d44898ba670b814b860bd0ec73c48129 (patch) | |
| tree | b0c476ac0dd11fe2ed8169d5fd8fccbeefc88711 /indra | |
| parent | e5e8652e2c8c7dd8b22bc49dc8d422fff714624a (diff) | |
MAINT-328 FIXED Use stopTracking() before each new beacon
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llfloatermap.cpp | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/indra/newview/llfloatermap.cpp b/indra/newview/llfloatermap.cpp index a65e9e911a..539869a084 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 |