From 9462a1861b3a10467370380d11cf2e82a91c4ab7 Mon Sep 17 00:00:00 2001
From: Kitto Flora
Date: Thu, 11 Nov 2010 04:49:47 +0000
Subject: Fix excessive forward motion and flailing while descending a slope,
 prevent adding motion while falling from flying.

---
 OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenSim/Region/Framework/Scenes/Animation')

diff --git a/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs b/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
index 9658e11..9c103cb 100644
--- a/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
+++ b/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
@@ -248,7 +248,7 @@ TrySetMovementAnimation("STAND");
                     m_animTickFall = Environment.TickCount;
                 }
 //                else if (!jumping && fallElapsed > FALL_DELAY)
-                else if (!m_jumping && (fallElapsed > FALL_DELAY) && (fallVelocity < -3.0f) )        // add for falling and jumping
+                else if (!m_jumping && (fallElapsed > FALL_DELAY) && (fallVelocity < -3.0f) && (m_scenePresence.m_wasFlying)) // add for falling and jumping
                 {
                     // Falling long enough to trigger the animation
 //Console.WriteLine("FALLDOWN");  //##
-- 
cgit v1.1