MAINT-1968 FIXED Reset camera when toggling flying same as all other methods.

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.