diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-26 09:50:06 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-26 09:50:06 +0100 |
| commit | ec5a9e26a00f94f57651c1bbef2bca0d88200655 (patch) | |
| tree | 3b0b3045b2074ddc6385b25f0012553c6ebdc9a5 | |
| parent | 0b03cde790d54b5ebc41ee5dafa999eedde91a90 (diff) | |
| parent | 0225b5354bad94e7fe6bdb26be32322253403206 (diff) | |
merge from PE's viewer-hotfix
| -rw-r--r-- | indra/newview/llagent.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
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; |