diff options
| author | angela <angela@lindenlab.com> | 2009-10-30 10:48:10 +0800 |
|---|---|---|
| committer | angela <angela@lindenlab.com> | 2009-10-30 10:48:10 +0800 |
| commit | 22e29b1a856343a13ca5c3f015226cf6544fd9e8 (patch) | |
| tree | 78b4dc789106678ebb1643f49a5d090e323db05a /indra/newview/llmoveview.cpp | |
| parent | a74e12d26b645063c4373c8354667423dec2d3f0 (diff) | |
| parent | 5c4ec60c966bd1857fb195f73d2d09117b783f9a (diff) | |
merge
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: |