From 0225b5354bad94e7fe6bdb26be32322253403206 Mon Sep 17 00:00:00 2001 From: Eugene Mutavchi Date: Fri, 23 Apr 2010 14:21:43 +0300 Subject: Related to EXT-1655 ([BSI] Always flying after pressing "Stand" to stand up from an object) - disabled forcing of flying at autopilot stops (for "Sit" autopilot behavior). Reviewed by Tofu Linden at https://codereview.productengine.com/secondlife/r/253/ --HG-- branch : product-engine --- indra/newview/llagent.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp index 5c54146caa..2f0afd0c91 100644 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -2227,7 +2227,10 @@ void LLAgent::startAutoPilotGlobal(const LLVector3d &target_global, const std::s if ( distance > 1.f && heightDelta > (sqrtf(mAutoPilotStopDistance) + 1.f)) { setFlying(TRUE); - mAutoPilotFlyOnStop = TRUE; + // Do not force flying for "Sit" behavior to prevent flying after pressing "Stand" + // from an object. See EXT-1655. + if ("Sit" != mAutoPilotBehaviorName) + mAutoPilotFlyOnStop = TRUE; } mAutoPilot = TRUE; -- cgit v1.2.3