diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2017-04-21 16:43:56 -0400 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2017-04-21 16:43:56 -0400 |
commit | 5f6bcaf456469f07d23a5599a1fed59420fd6ae7 (patch) | |
tree | aff6d5b13b69121919433f80103e0594b3525c9d /indra/newview/llfloatermap.cpp | |
parent | f62b5503285d828813d87779fa0658ee5f122ac5 (diff) | |
parent | 7a6a2db289581e43c509ca7dfff7d9b72897a10e (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) { |