diff options
| author | Yuri Chebotarev <ychebotarev@productengine.com> | 2010-04-26 19:07:55 +0300 |
|---|---|---|
| committer | Yuri Chebotarev <ychebotarev@productengine.com> | 2010-04-26 19:07:55 +0300 |
| commit | 6a9d277e00d9c20a8f3359627864f731923baac3 (patch) | |
| tree | e3a6ee9046bca45cc42e9cd82cb4713a99d8d3da /indra/newview/llagent.cpp | |
| parent | 24894a5f71b76aab407976ff9bf36bfc0f7ae70a (diff) | |
| parent | fbfc85176670f3f948e6e2f00c8d8e37c96d5299 (diff) | |
merge
--HG--
branch : product-engine
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; |