diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2017-06-20 16:11:33 -0400 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2017-06-20 16:11:33 -0400 |
commit | a3066b7375a13b61861b554519673dfc24322c22 (patch) | |
tree | 9b3d61c932ff8a88e5a2384f138e7ed9b83248ac /indra/newview/llfloatermap.cpp | |
parent | f1e52656e9e328d66aa5050bc9e59948a0217283 (diff) | |
parent | 124d8c8dce3a5da8aa73f12f8733c65f57479a24 (diff) |
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
Diffstat (limited to 'indra/newview/llfloatermap.cpp')
-rw-r--r-- | indra/newview/llfloatermap.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfloatermap.cpp b/indra/newview/llfloatermap.cpp index 333ff863e5..fc2da772f3 100644 --- a/indra/newview/llfloatermap.cpp +++ b/indra/newview/llfloatermap.cpp @@ -119,7 +119,7 @@ BOOL LLFloaterMap::handleDoubleClick(S32 x, S32 y, MASK mask) LLVector3d pos_global = mMap->viewPosToGlobal(x, y); - LLTracker::stopTracking(NULL); + LLTracker::stopTracking(false); LLFloaterWorldMap* world_map = LLFloaterWorldMap::getInstance(); if (world_map) { |