diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-17 12:02:54 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-17 12:02:54 +0100 |
| commit | 06884cf1371d4c1ee02d337242e46b0f3bbe8837 (patch) | |
| tree | 9255ad9db22916ae0add7cae37705e58aa9c465e /indra/newview/llagent.cpp | |
| parent | 663d8f7870c2858956aea8ab20129fd084a96dc8 (diff) | |
| parent | d69084d5d86d551adbc9721276aa60959b7d7899 (diff) | |
merge from PE's 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()) |