1 files changed, 5 insertions, 1 deletions

diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index ebb9b0a..287f637 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -2420,7 +2420,11 @@ namespace OpenSim.Region.Framework.Scenes
                     //    m_log.Info("[AGENT]: Stop Flying");
                     //}
                 }
-                if (!PhysicsActor.Flying && PhysicsActor.IsColliding)
+                if (Animator.Falling && m_wasFlying)    // if falling from flying, disable motion add
+                {
+                    direc *= 0.0f;
+                }
+                else if (!PhysicsActor.Flying && PhysicsActor.IsColliding)
                 {
                     if (direc.Z > 2.0f)
                     {