* Fixed the Link + Duplicate + Unlink both = 'ODE Invalid Argument in Collision Space Crash'
* Added: Console comment: [PHYSICS]: The scene reused a disposed PhysActor! *waves finger*, Don't be evil.0.6.0-stable
parent
081b2ac34e
commit
5b6eba968b
|
@ -701,7 +701,8 @@ namespace OpenSim.Region.Physics.OdePlugin
|
|||
{
|
||||
changeadd(timestep);
|
||||
}
|
||||
|
||||
if (prim_geom != (IntPtr)0)
|
||||
{
|
||||
if (m_taintposition != _position)
|
||||
Move(timestep);
|
||||
|
||||
|
@ -736,6 +737,11 @@ namespace OpenSim.Region.Physics.OdePlugin
|
|||
if (m_taintparent != _parent)
|
||||
changelink(timestep);
|
||||
}
|
||||
else
|
||||
{
|
||||
m_log.Error("[PHYISCS]: The scene reused a disposed PhysActor! *waves finger*, Don't be evil.");
|
||||
}
|
||||
}
|
||||
|
||||
private void changelink(float timestep)
|
||||
{
|
||||
|
|
|
@ -238,6 +238,7 @@ namespace OpenSim.Region.Physics.OdePlugin
|
|||
|
||||
internal void waitForSpaceUnlock(IntPtr space)
|
||||
{
|
||||
if (space != (IntPtr)0)
|
||||
while (d.SpaceLockQuery(space)){ } // Wait and do nothing
|
||||
}
|
||||
|
||||
|
@ -1014,6 +1015,11 @@ namespace OpenSim.Region.Physics.OdePlugin
|
|||
System.Threading.Thread.Sleep(20);
|
||||
if (currentspace != space)
|
||||
{
|
||||
m_log.Info("[SPACE]: C:" + currentspace.ToString() + " g:" + geom.ToString());
|
||||
if (currentspace == (IntPtr) 0)
|
||||
{
|
||||
int adfadf = 0;
|
||||
}
|
||||
if (d.SpaceQuery(currentspace, geom) && currentspace != (IntPtr) 0)
|
||||
{
|
||||
if (d.GeomIsSpace(currentspace))
|
||||
|
|
Loading…
Reference in New Issue