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

still issues with volume detectors and sleeping bodies

httptests
UbitUmarov 2017-04-15 02:48:58 +01:00
parent 4f8f04d949
commit 156ef0bbe3
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
OpenSim/Region/PhysicsModules/ubOde/ODEPrim.cs
View File

@ -1205,13 +1205,17 @@ namespace OpenSim.Region.PhysicsModule.ubOde
} }
} }
internal void clearSleeperCollisions()
{
if(CollisionVDTCEventsThisFrame != null && CollisionVDTCEventsThisFrame.Count >0 )
CollisionVDTCEventsThisFrame.Clear();
}
public void SendCollisions(int timestep) public void SendCollisions(int timestep)
{ {
if (m_cureventsubscription < 50000) if (m_cureventsubscription < 50000)
m_cureventsubscription += timestep; m_cureventsubscription += timestep;
if(CollisionVDTCEventsThisFrame != null && CollisionVDTCEventsThisFrame.Count >0 && (Body == IntPtr.Zero || d.BodyIsEnabled(Body)))
CollisionVDTCEventsThisFrame.Clear();
if (m_cureventsubscription < m_eventsubscription) if (m_cureventsubscription < m_eventsubscription)
return; return;

2
OpenSim/Region/PhysicsModules/ubOde/ODEScene.cs
View File

@ -1172,6 +1172,8 @@ namespace OpenSim.Region.PhysicsModule.ubOde
{ {
aprim.CollisionScore = 0; aprim.CollisionScore = 0;
aprim.IsColliding = false; aprim.IsColliding = false;
if(!aprim.m_outbounds && d.BodyIsEnabled(aprim.Body))
aprim.clearSleeperCollisions();
} }
} }
lock (_activegroups) lock (_activegroups)