diff options
| author | Kent Quirk <q@lindenlab.com> | 2010-04-14 15:22:51 -0400 |
|---|---|---|
| committer | Kent Quirk <q@lindenlab.com> | 2010-04-14 15:22:51 -0400 |
| commit | b15629c12f9371773998075f8b599527b73c3051 (patch) | |
| tree | 2f310864b495ef3817208a9f0984d2d9a544bc4b /indra/newview/llagent.cpp | |
| parent | 244418e6b2f4647d09995492f52180a0d3824cd2 (diff) | |
This change originally to fix EXT-1655 has caused a failure to render sitting avatars (EXT-6835).
We can probably find a "right" fix, but for now backing it out.
Backed out changeset bd384ded4268
Diffstat (limited to 'indra/newview/llagent.cpp')
| -rw-r--r-- | indra/newview/llagent.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp index d9d95f1cd6..c5d7f6f118 100644 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -2296,11 +2296,6 @@ void LLAgent::stopAutoPilot(BOOL user_cancel) { resetAxes(mAutoPilotTargetFacing); } - // If the user cancelled, don't change the fly state - if (!user_cancel) - { - setFlying(mAutoPilotFlyOnStop); - } //NB: auto pilot can terminate for a reason other than reaching the destination if (mAutoPilotFinishedCallback) { @@ -2308,6 +2303,11 @@ void LLAgent::stopAutoPilot(BOOL user_cancel) } mLeaderID = LLUUID::null; + // If the user cancelled, don't change the fly state + if (!user_cancel) + { + setFlying(mAutoPilotFlyOnStop); + } setControlFlags(AGENT_CONTROL_STOP); if (user_cancel && !mAutoPilotBehaviorName.empty()) |