diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-05-04 09:38:29 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-05-04 09:38:29 -0400 |
| commit | 383fccbd57ef273aa803497ad87cf9badc5db90a (patch) | |
| tree | ab042292d129a92092b35accde69eb57a3565389 /indra/newview/llagent.cpp | |
| parent | f5bb046c5d3d393352b5b90424837a3d213dfbb9 (diff) | |
| parent | b9bb792c478d703c6442351ecb563c0a67f77111 (diff) | |
merge changes for viewer-development before mesh merge
Diffstat (limited to 'indra/newview/llagent.cpp')
| -rw-r--r-- | indra/newview/llagent.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp index d011fe9044..fc5529cd59 100644 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -1356,7 +1356,7 @@ void LLAgent::stopAutoPilot(BOOL user_cancel) //NB: auto pilot can terminate for a reason other than reaching the destination if (mAutoPilotFinishedCallback) { - mAutoPilotFinishedCallback(!user_cancel && dist_vec(gAgent.getPositionGlobal(), mAutoPilotTargetGlobal) < mAutoPilotStopDistance, mAutoPilotCallbackData); + mAutoPilotFinishedCallback(!user_cancel && dist_vec_squared(gAgent.getPositionGlobal(), mAutoPilotTargetGlobal) < (mAutoPilotStopDistance * mAutoPilotStopDistance), mAutoPilotCallbackData); } mLeaderID = LLUUID::null; |