From 8d472a9c7b39f07d5281cff525a59dc663219ecf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Liru=20F=C3=A6rs?= Date: Thu, 16 Jan 2020 17:43:14 -0500 Subject: [PATCH] Rearrange some Follow code --- indra/newview/llagent.cpp | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp index 44713e226..f21c2970b 100644 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -1809,10 +1809,18 @@ void LLAgent::autoPilot(F32 *delta_yaw) } } } - else if (gAgentAvatarp->isSitting()) // Leader isn't sitting, standUp if needed + else { - standUp(); - mAutoPilotNoProgressFrameCount = 0; // Ground Sit may have incremented this, reset it + if (dist_vec(av->getPositionAgent(), getPositionAgent()) <= mAutoPilotStopDistance) + { + follow = 3; // We're close enough, indicate no walking + } + + if (gAgentAvatarp->isSitting()) // Leader isn't sitting, standUp if needed + { + standUp(); + mAutoPilotNoProgressFrameCount = 0; // Ground Sit may have incremented this, reset it + } } } } @@ -1829,11 +1837,11 @@ void LLAgent::autoPilot(F32 *delta_yaw) mAutoPilotNoProgressFrameCount = 0; // Ground Sit may have incremented this, reset it mAutoPilotTargetGlobal = pos; setFlying(true); // Should we fly here? Altitude is often invalid... - } - if (dist_vec(mAutoPilotTargetGlobal, getPositionGlobal()) <= mAutoPilotStopDistance) - { - follow = 3; // We're close enough, indicate no walking + if (dist_vec(mAutoPilotTargetGlobal, getPositionGlobal()) <= mAutoPilotStopDistance) + { + follow = 3; // We're close enough, indicate no walking + } } }