diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-17 12:39:49 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-17 12:39:49 +0100 |
| commit | 689fdd553c38ddef9c33f90c0b408bb2e9299742 (patch) | |
| tree | b64aae5890112fe3c14c86acddc66cd872dcf223 /indra/newview/llagent.cpp | |
| parent | 14f3b77b9c4103f324d24625bd30dd106ab1817f (diff) | |
| parent | 3f10caafc07b0d1a60d2b943684e87dec265f5bc (diff) | |
merge from viewer-trunk
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 ec465358fa..f434782977 100644 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -1295,11 +1295,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) { @@ -1307,6 +1302,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()) |