From 10b41ba4554e3a13796cc3b55663e373f12af2cb Mon Sep 17 00:00:00 2001
From: Teravus Ovares
Date: Tue, 13 Nov 2007 05:10:14 +0000
Subject: * Fixed the walk vs fall animation. * Tweaked a few things

---
 OpenSim/Region/Environment/Scenes/ScenePresence.cs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'OpenSim/Region/Environment')

diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index 69bf05a..48f3ef0 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -458,7 +458,7 @@ namespace OpenSim.Region.Environment.Scenes
                 + (((float)m_visualParams[125] / 255.0f) / 1.5f);
             if (PhysicsActor != null)
             {
-                PhysicsVector SetSize = new PhysicsVector(0, 0, m_avHeight);
+                PhysicsVector SetSize = new PhysicsVector(0.45f, 0.6f, m_avHeight);
                 PhysicsActor.Size = SetSize;
             }
             //OpenSim.Framework.Console.MainLog.Instance.Verbose("CLIENT", "Set Avatar Height to: " + (1.50856f + (((float)m_visualParams[25] / 255.0f) * (2.525506f - 1.50856f))).ToString() + "m" + " Leglength: " + ((float)m_visualParams[125]).ToString() + ":" + (((float)m_visualParams[125] / 255.0f)).ToString() + "m");
@@ -681,11 +681,11 @@ namespace OpenSim.Region.Environment.Scenes
                         }
                         else
                         {
-                            if (!PhysicsActor.IsColliding && m_physicsActor.Velocity.Z > 6)
+                            if (!PhysicsActor.IsColliding && m_physicsActor.Velocity.Z < -6)
                             {
                                 SendAnimPack(Animations.AnimsLLUUID["FALLDOWN"], 1);
                             }
-                            else if (!PhysicsActor.IsColliding && Velocity.Z > 0)
+                            else if (!PhysicsActor.IsColliding && Velocity.Z > 0 && (m_movementflag & (uint) MainAvatar.ControlFlags.AGENT_CONTROL_UP_POS) != 0)
                             {
                                 SendAnimPack(Animations.AnimsLLUUID["JUMP"], 1);
                             }
@@ -716,11 +716,11 @@ namespace OpenSim.Region.Environment.Scenes
                     }
                     else
                     {
-                        if (!PhysicsActor.IsColliding && m_physicsActor.Velocity.Z > 6 && !m_physicsActor.Flying)
+                        if (!PhysicsActor.IsColliding && m_physicsActor.Velocity.Z < -6 && !m_physicsActor.Flying)
                         {
                             SendAnimPack(Animations.AnimsLLUUID["FALLDOWN"], 1);
                         }
-                        else if (!PhysicsActor.IsColliding && Velocity.Z > 0 && !m_physicsActor.Flying)
+                        else if (!PhysicsActor.IsColliding && Velocity.Z > 0 && !m_physicsActor.Flying && (m_movementflag & (uint) MainAvatar.ControlFlags.AGENT_CONTROL_UP_POS) != 0)
                         {
                             SendAnimPack(Animations.AnimsLLUUID["JUMP"], 1);
                         }
-- 
cgit v1.1