diff options
| author | Eugene Mutavchi <emutavchi@productengine.com> | 2010-04-07 13:38:21 +0300 |
|---|---|---|
| committer | Eugene Mutavchi <emutavchi@productengine.com> | 2010-04-07 13:38:21 +0300 |
| commit | 244418e6b2f4647d09995492f52180a0d3824cd2 (patch) | |
| tree | a0dc6aa5adfe6ce010696f06693d786b140c27c9 /indra/newview/llagent.cpp | |
| parent | 8a3dca48ebb9d2c48c58187f8e49849c6830737d (diff) | |
Fixed critical bug EXT-1655 ([BSI] Always flying after pressing "Stand" to stand up from an object)
- moved restoring the flying of the agent before calling the mAutoPilotFinishedCallback, to allow finished callback to change it.
- fixed LLVOAvatar::sitOnObject() to set mIsSitting = TRUE before stoping the autopilot, like it was in 1.23 version.
Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/185/
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 c5d7f6f118..d9d95f1cd6 100644 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -2296,6 +2296,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) { @@ -2303,11 +2308,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()) |