merge changes for storm-1870

doc/contributions.txt

@@ -631,6 +631,7 @@ Jonathan Yap
 	STORM-1809
 	STORM-1793
 	STORM-1810
+	STORM-1870
 Kadah Coba
 	STORM-1060
 Jondan Lundquist

indra/newview/lltracker.cpp

@@ -251,7 +251,7 @@ void LLTracker::render3D()
 				instance()->mBeaconText->setDoFade(FALSE);
 			}
 			
-			F32 dist = gFloaterWorldMap->getDistanceToDestination(instance()->mTrackedPositionGlobal, 0.0f);
+			F32 dist = gFloaterWorldMap->getDistanceToDestination(instance()->getTrackedPositionGlobal(), 0.0f);
 			if (dist < DESTINATION_REACHED_RADIUS)
 			{
 				instance()->stopTrackingAvatar();