diff options
author | Logan Dethrow <log@lindenlab.com> | 2011-05-06 15:25:12 -0400 |
---|---|---|
committer | Logan Dethrow <log@lindenlab.com> | 2011-05-06 15:25:12 -0400 |
commit | 39ad3f1d880a26dcf8189cad2501002c189a7ac2 (patch) | |
tree | a843d0c5843ca5e6a5fcbdfc6929bc2b21b960d6 /indra/newview/llagent.cpp | |
parent | 5c7a906b44aa950ec3c8b786fec6516b51f9d66c (diff) | |
parent | def9f9290e661e6a35b7b255eb71b6e2767fdea0 (diff) |
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 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; |