From 750f75c514b2fcda19edfd234f6508b2c779d7c7 Mon Sep 17 00:00:00 2001 From: Melanie Thielker Date: Tue, 14 Jul 2009 23:20:59 +0000 Subject: [PATCH] Thank you, Twitch, for a patch to restore mayhem and murder to OpenSim Fixes Mantis #3888 --- OpenSim/Region/Physics/OdePlugin/ODECharacter.cs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs index b832e0a7dc..9aff1ca1f7 100644 --- a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs +++ b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs @@ -304,7 +304,7 @@ namespace OpenSim.Region.Physics.OdePlugin } if (m_wascolliding != m_iscolliding) { - //base.SendCollisionUpdate(new CollisionEventUpdate()); + base.SendCollisionUpdate(new CollisionEventUpdate()); } m_wascolliding = m_iscolliding; } @@ -358,7 +358,7 @@ namespace OpenSim.Region.Physics.OdePlugin } if (m_wascollidingGround != m_iscollidingGround) { - //base.SendCollisionUpdate(new CollisionEventUpdate()); + base.SendCollisionUpdate(new CollisionEventUpdate()); } m_wascollidingGround = m_iscollidingGround; } @@ -755,10 +755,10 @@ namespace OpenSim.Region.Physics.OdePlugin m_pidControllerActive = false; force *= 100f; doForce(force); - //m_log.Debug("Push!"); - //_target_velocity.X += force.X; - // _target_velocity.Y += force.Y; - //_target_velocity.Z += force.Z; + m_log.Debug("Push!"); + _target_velocity.X += force.X; + _target_velocity.Y += force.Y; + _target_velocity.Z += force.Z; } else {