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

chODE bug fix

avinationmerge
UbitUmarov 2012-04-16 17:14:31 +01:00
parent f05a977afa
commit 04ed5519a5
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
OpenSim/Region/Physics/ChOdePlugin/ODECharacter.cs
View File

@ -921,6 +921,8 @@ namespace OpenSim.Region.Physics.OdePlugin
m_haveTaintMomentum = true; m_haveTaintMomentum = true;
_parent_scene.AddPhysicsActorTaint(this); _parent_scene.AddPhysicsActorTaint(this);
} }
else
m_log.Warn("[PHYSICS] !isFinite momentum");
} }
@ -1337,7 +1339,6 @@ namespace OpenSim.Region.Physics.OdePlugin
{ {
lock (m_syncRoot) lock (m_syncRoot)
{ {
if (m_tainted_isPhysical != m_isPhysical) if (m_tainted_isPhysical != m_isPhysical)
{ {
if (m_tainted_isPhysical) if (m_tainted_isPhysical)
@ -1379,9 +1380,9 @@ namespace OpenSim.Region.Physics.OdePlugin
{ {
d.GeomDestroy(Shell); d.GeomDestroy(Shell);
} }
catch (System.AccessViolationException) catch (Exception e)
{ {
m_log.Error("[PHYSICS]: PrimGeom dead"); m_log.ErrorFormat("[PHYSICS]: Failed to destroy character shell {0}",e.Message);
} }
// Remove any old entries // Remove any old entries
//string tShell; //string tShell;
@ -1428,10 +1429,10 @@ namespace OpenSim.Region.Physics.OdePlugin
{ {
d.BodySetPosition(Body, m_taintPosition.X, m_taintPosition.Y, m_taintPosition.Z); d.BodySetPosition(Body, m_taintPosition.X, m_taintPosition.Y, m_taintPosition.Z);
_position.X = m_taintPosition.X;
_position.Y = m_taintPosition.Y;
_position.Z = m_taintPosition.Z;
} }
_position.X = m_taintPosition.X;
_position.Y = m_taintPosition.Y;
_position.Z = m_taintPosition.Z;
} }
if (m_haveTaintMomentum) if (m_haveTaintMomentum)
@ -1440,7 +1441,8 @@ namespace OpenSim.Region.Physics.OdePlugin
_velocity = m_taintMomentum; _velocity = m_taintMomentum;
_target_velocity = m_taintMomentum; _target_velocity = m_taintMomentum;
m_pidControllerActive = true; m_pidControllerActive = true;
d.BodySetLinearVel(Body, _velocity.X, _velocity.Y, _velocity.Z); if (Body != IntPtr.Zero)
d.BodySetLinearVel(Body, _velocity.X, _velocity.Y, _velocity.Z);
} }
} }
} }