diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-06-05 10:43:35 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-06-05 10:43:35 -0400 |
| commit | 827622860097b40e77cb53d5770197773cde5191 (patch) | |
| tree | edb52bd79a4728430d4e352668b5633e568f6ee6 | |
| parent | c432ee1581614ea75230bc59d90671eac875527f (diff) | |
| parent | f58cfdac22b3a739273ec6a2143057a536646eb2 (diff) | |
merge changes for storm-1870
| -rw-r--r-- | doc/contributions.txt | 1 | ||||
| -rw-r--r-- | indra/newview/lltracker.cpp | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index 8f9b728c3b..378edb7e99 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -631,6 +631,7 @@ Jonathan Yap STORM-1809 STORM-1793 STORM-1810 + STORM-1870 Kadah Coba STORM-1060 Jondan Lundquist diff --git a/indra/newview/lltracker.cpp b/indra/newview/lltracker.cpp index bf1f8808a7..cbd16e873d 100644 --- a/indra/newview/lltracker.cpp +++ b/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(); |