From e15917f4658789096902625dddf226dd218a23c2 Mon Sep 17 00:00:00 2001 From: Tom Date: Wed, 14 Sep 2011 19:34:03 -0700 Subject: [PATCH] Fixed a movement regression - Kitto's jump code is no longer needed (plus it's an eyesore) --- .../Region/Framework/Scenes/ScenePresence.cs | 44 ++++--------------- 1 file changed, 8 insertions(+), 36 deletions(-) diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 7a86f9867b..fa6945caf3 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs @@ -3620,45 +3620,17 @@ namespace OpenSim.Region.Framework.Scenes /// public override void UpdateMovement() { - if (Animator!=null) // add for jumping - { // add for jumping - // if (!m_animator.m_jumping) // add for jumping - // { // add for jumping + if (m_forceToApply.HasValue) + { + Vector3 force = m_forceToApply.Value; - if (m_forceToApply.HasValue) // this section realigned - { + m_updateflag = true; - Vector3 force = m_forceToApply.Value; - m_updateflag = true; -if (m_animator.m_jumping) force.Z = m_animator.m_jumpVelocity; // add for jumping - Velocity = force; -//Console.WriteLine("UM1 {0}", Velocity); - m_forceToApply = null; - } - else - { - if (m_isNudging) - { - Vector3 force = Vector3.Zero; + Velocity = force; - m_updateflag = true; -if (m_animator.m_jumping) force.Z = m_animator.m_jumpVelocity; // add for jumping - Velocity = force; -//Console.WriteLine("UM2 {0}", Velocity); - m_isNudging = false; - m_updateCount = UPDATE_COUNT; //KF: Update anims to pickup "STAND" - } - else // add for jumping - { // add for jumping - Vector3 force = Vector3.Zero; // add for jumping -if (m_animator.m_jumping) force.Z = m_animator.m_jumpVelocity; // add for jumping -//Console.WriteLine("UM3 {0}", Velocity); - Velocity = force; // add for jumping - } - } - // } // end realign - } // add for jumping - } // add for jumping + m_forceToApply = null; + } + } /// /// Adds a physical representation of the avatar to the Physics plugin