diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-26 10:57:51 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-26 10:57:51 +0100 |
| commit | 438f0e372ee8a1d41d535314e4061f20f6c66c88 (patch) | |
| tree | f329e9c86829b06ded1742db7edf271aacb7d3c1 /indra/newview/llagent.cpp | |
| parent | 1a987e8d32a733cace7ffdb239729380cd53f87c (diff) | |
| parent | a0467365140c504eb0f5ad053ac22a2698a2abd7 (diff) | |
merge from viewer-trunk
Diffstat (limited to 'indra/newview/llagent.cpp')
| -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 8bcf680876..ddcaeb113d 100644 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -1226,7 +1226,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; |