diff options
author | Aura Linden <aura@lindenlab.com> | 2015-10-13 16:44:20 -0700 |
---|---|---|
committer | Aura Linden <aura@lindenlab.com> | 2015-10-13 16:44:20 -0700 |
commit | 2f6166a5a4f8d5be679cef0699142c4ef061fb55 (patch) | |
tree | f45efe7e4c55c37dc097f15f8e0f445d86bfe972 /indra/newview/llmoveview.cpp | |
parent | 8729f5d23a52263e55df5574c672c87d00b563bd (diff) | |
parent | a16a6034c25c5e78331ef1bd13485df8759456e5 (diff) |
Pulled merge from llinternal/bento-box.
Diffstat (limited to 'indra/newview/llmoveview.cpp')
-rwxr-xr-x | indra/newview/llmoveview.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/indra/newview/llmoveview.cpp b/indra/newview/llmoveview.cpp index fe562baf96..70035bcc74 100755 --- a/indra/newview/llmoveview.cpp +++ b/indra/newview/llmoveview.cpp @@ -303,7 +303,15 @@ void LLFloaterMove::onFlyButtonClick() void LLFloaterMove::setMovementMode(const EMovementMode mode) { mCurrentMode = mode; - gAgent.setFlying(MM_FLY == mode); + + if(MM_FLY == mode) + { + LLAgent::toggleFlying(); + } + else + { + gAgent.setFlying(FALSE); + } // attempts to set avatar flying can not set it real flying in some cases. // For ex. when avatar fell down & is standing up. |