diff options
| author | callum <none@none> | 2011-05-04 10:36:27 -0700 |
|---|---|---|
| committer | callum <none@none> | 2011-05-04 10:36:27 -0700 |
| commit | 3f9253e783826bbe27a995786be8305f8ecb2d6d (patch) | |
| tree | 29408e5e249a8b4813095154fbba9bdeaa7f047d /indra/newview/llagent.cpp | |
| parent | a14172dd40fa11196950f391e4fc945e432122bf (diff) | |
| parent | b9bb792c478d703c6442351ecb563c0a67f77111 (diff) | |
Merge with http://bitbucket.org/lindenlab/viewer-development (r15992)
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 a6d2c96d52..7319c0d902 100644 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -1340,7 +1340,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; |