OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Thank you, Twitch, for a patch to restore mayhem and murder to OpenSim 

Fixes Mantis #3888
trunk
Melanie Thielker 2009-07-14 23:20:59 +00:00
parent e53596f607
commit 750f75c514
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
View File

@ -304,7 +304,7 @@ namespace OpenSim.Region.Physics.OdePlugin
} }
if (m_wascolliding != m_iscolliding) if (m_wascolliding != m_iscolliding)
{ {
//base.SendCollisionUpdate(new CollisionEventUpdate()); base.SendCollisionUpdate(new CollisionEventUpdate());
} }
m_wascolliding = m_iscolliding; m_wascolliding = m_iscolliding;
} }
@ -358,7 +358,7 @@ namespace OpenSim.Region.Physics.OdePlugin
} }
if (m_wascollidingGround != m_iscollidingGround) if (m_wascollidingGround != m_iscollidingGround)
{ {
//base.SendCollisionUpdate(new CollisionEventUpdate()); base.SendCollisionUpdate(new CollisionEventUpdate());
} }
m_wascollidingGround = m_iscollidingGround; m_wascollidingGround = m_iscollidingGround;
} }
@ -755,10 +755,10 @@ namespace OpenSim.Region.Physics.OdePlugin
m_pidControllerActive = false; m_pidControllerActive = false;
force *= 100f; force *= 100f;
doForce(force); doForce(force);
//m_log.Debug("Push!"); m_log.Debug("Push!");
//_target_velocity.X += force.X; _target_velocity.X += force.X;
// _target_velocity.Y += force.Y; _target_velocity.Y += force.Y;
//_target_velocity.Z += force.Z; _target_velocity.Z += force.Z;
} }
else else
{ {