diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-05-02 07:24:15 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-05-02 07:24:15 -0400 |
| commit | a32daa0c10b285354e94e0e8bf0cc6c5ffce09a5 (patch) | |
| tree | c2ba5f181935b95d2f23406c41917401cd4be963 /indra/newview/llagent.cpp | |
| parent | 929bde3ed08f9a1d2a8f4c9821b0d51c11d895e9 (diff) | |
| parent | 89216a6c213c126b8ab6dacaeb21340fa8f7a001 (diff) | |
merge changes for vwr-25126
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 7d491a7774..aea4e78436 100644 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -1337,7 +1337,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; |