diff options
| author | Yuri Chebotarev <ychebotarev@productengine.com> | 2009-10-29 18:10:25 +0200 |
|---|---|---|
| committer | Yuri Chebotarev <ychebotarev@productengine.com> | 2009-10-29 18:10:25 +0200 |
| commit | 7d64c6a226046d962bf5cd2b1e53df6fe33a730d (patch) | |
| tree | 2bf46411604c735d6efb975806c03e695b516cab /indra/newview/llmoveview.cpp | |
| parent | 19e99af208f0dad118cf3029f409442bca5d3e21 (diff) | |
| parent | 191547dcb232535d24091be0fb4169c6c7eb89ef (diff) | |
merge
--HG--
branch : product-engine
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: |