diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-26 10:02:53 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-26 10:02:53 +0100 |
| commit | 1993732a6ca6a27f5e433e108b614eed5153cd1f (patch) | |
| tree | a53a347a3f40df497dfd66adc12abcc9bbf893ce /indra/newview | |
| parent | 6a6af64e072968f94440c137f5f83985755eda8b (diff) | |
| parent | ec5a9e26a00f94f57651c1bbef2bca0d88200655 (diff) | |
final(?!) merge from viewer-hotfix.
Diffstat (limited to 'indra/newview')
| -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; |