summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorMnikolenko ProductEngine <mnikolenko@productengine.com>2015-07-06 12:12:27 +0300
committerMnikolenko ProductEngine <mnikolenko@productengine.com>2015-07-06 12:12:27 +0300
commit1c08b2a2e987f43f97a51de652ee6c2a574291e1 (patch)
treed72704bce7713dcccf27fee29b098ce9df574aa9 /indra
parentb5bedce5c287aba7fa6166c385da15877fcb0071 (diff)
MAINT-1968 FIXED Reset camera when toggling flying same as all other methods.
Diffstat (limited to 'indra')
-rwxr-xr-xindra/newview/llmoveview.cpp10
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.