From a642968fd548e7bb7f3e47e937e209526226d0c0 Mon Sep 17 00:00:00 2001 From: "Teravus Ovares (Dan Olivares)" Date: Wed, 25 Nov 2009 04:00:52 -0500 Subject: [PATCH] * Reverting last commit.. because it just made it worse. --- .../Framework/Scenes/Animation/ScenePresenceAnimator.cs | 6 ------ OpenSim/Region/Framework/Scenes/ScenePresence.cs | 3 --- 2 files changed, 9 deletions(-) diff --git a/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs b/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs index da1104a5ba..2e4c260093 100644 --- a/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs +++ b/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs @@ -200,10 +200,7 @@ namespace OpenSim.Region.Framework.Scenes.Animation else if (move.Z < 0f) { if (actor != null && actor.IsColliding) - { - //Console.WriteLine("LAND"); return "LAND"; - } else return "HOVER_DOWN"; } @@ -252,10 +249,7 @@ namespace OpenSim.Region.Framework.Scenes.Animation float landElapsed = (float)(Environment.TickCount - m_animTickFall) / 1000f; if (landElapsed <= FALL_DELAY) - { - m_animTickFall = 0; return "LAND"; - } } m_animTickFall = 0; diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 33717b1a24..5604e3d3f0 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs @@ -1445,10 +1445,7 @@ namespace OpenSim.Region.Framework.Scenes // nesting this check because LengthSquared() is expensive and we don't // want to do it every step when flying. if ((Velocity.LengthSquared() <= LAND_VELOCITYMAG_MAX)) - { StopFlying(); - m_physicsActor.Flying = false; - } } }