diff options
| author | Oz Linden <oz@lindenlab.com> | 2016-08-11 15:36:09 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2016-08-11 15:36:09 -0400 |
| commit | 6ff420d705625fef4b0456c19bb9c766cabb31af (patch) | |
| tree | 16c27571df04932dd830b35e06cdf4e9b5dbf07e /indra/newview/lltracker.cpp | |
| parent | c32b27f5b77c7d8e53b11163d04f2842949d71de (diff) | |
| parent | 4fb100ac7a33174883184f1320d0beac08ead3a7 (diff) | |
merge changes for 4.0.7-release
Diffstat (limited to 'indra/newview/lltracker.cpp')
| -rw-r--r-- | indra/newview/lltracker.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/lltracker.cpp b/indra/newview/lltracker.cpp index f611d0503f..b015cde45d 100644 --- a/indra/newview/lltracker.cpp +++ b/indra/newview/lltracker.cpp @@ -183,7 +183,7 @@ void LLTracker::render3D() F32 dist = gFloaterWorldMap->getDistanceToDestination(pos_global, 0.5f); if (dist < DESTINATION_REACHED_RADIUS) { - instance()->stopTrackingLocation(); + instance()->stopTrackingLocation(FALSE,TRUE); } else { @@ -655,13 +655,13 @@ void LLTracker::stopTrackingLandmark(BOOL clear_ui) } -void LLTracker::stopTrackingLocation(BOOL clear_ui) +void LLTracker::stopTrackingLocation(BOOL clear_ui, BOOL dest_reached) { purgeBeaconText(); mTrackedLocationName.assign(""); mIsTrackingLocation = FALSE; mTrackedPositionGlobal.zeroVec(); - gFloaterWorldMap->clearLocationSelection(clear_ui); + gFloaterWorldMap->clearLocationSelection(clear_ui, dest_reached); mTrackingStatus = TRACKING_NOTHING; mTrackingLocationType = LOCATION_NOTHING; } |