diff options
author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-05-04 10:06:34 -0400 |
---|---|---|
committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-05-04 10:06:34 -0400 |
commit | 0be3b1fdd9821929fc537e1c812f26268979dbf0 (patch) | |
tree | 2848e2c95a4006e6c9e5fcad11fe9b1ab2488db3 /indra/newview/llagent.cpp | |
parent | 8decd5a4e6c94e27381186e581cf199ba3ede437 (diff) | |
parent | a23ad02cf568b680a409cf40f69cfb1b1591082c (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 790f98e75d..f4023502f6 100644 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -1343,7 +1343,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; |