diff options
| author | Steve Bennetts <steve@lindenlab.com> | 2009-10-29 10:42:02 -0700 |
|---|---|---|
| committer | Steve Bennetts <steve@lindenlab.com> | 2009-10-29 10:42:02 -0700 |
| commit | 95031093c795f3a97cdc673c7b7807c944742ab8 (patch) | |
| tree | 378e103331e289894bbc915b15772ac844b6ccae /indra/newview/llmoveview.cpp | |
| parent | fb4e95f7ea0a1f6e900f6ee1de73ec02860ff815 (diff) | |
| parent | 15687e2acd07ed3c0a56a61af982595b99dc064f (diff) | |
merge changes from https://hg.aws.productengine.com/secondlife/viewer-2-0/ 3824-3835
Diffstat (limited to 'indra/newview/llmoveview.cpp')
| -rw-r--r-- | indra/newview/llmoveview.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/indra/newview/llmoveview.cpp b/indra/newview/llmoveview.cpp index 2b4e35208a..14da35594f 100644 --- a/indra/newview/llmoveview.cpp +++ b/indra/newview/llmoveview.cpp @@ -280,6 +280,14 @@ void LLFloaterMove::setMovementMode(const EMovementMode mode) mCurrentMode = mode; gAgent.setFlying(MM_FLY == mode); + // attempts to set avatar flying can not set it real flying in some cases. + // For ex. when avatar fell down & is standing up. + // So, no need to continue processing FLY mode. See EXT-1079 + if (MM_FLY == mode && !gAgent.getFlying()) + { + return; + } + switch (mode) { case MM_RUN: |