diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-07 13:03:35 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-07 13:03:35 +0100 |
| commit | adce2ecdf8f3a0efcd4907699d286012124ac496 (patch) | |
| tree | f36622a23028b73946bd3b70fd741b4f30464e33 /indra/newview/llagent.cpp | |
| parent | 8da371b0f08f92fb1fef083f0bfb526f0698afd7 (diff) | |
| parent | 7dd71a60c51ed81c1ddfa98d09a158488a85b753 (diff) | |
PE merge from pe-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 f434782977..ec465358fa 100644 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -1295,6 +1295,11 @@ 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) { @@ -1302,11 +1307,6 @@ 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()) |