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

don't bother locking OdeScene._perloopContact in single threaded code

0.7.2-post-fixes
Justin Clark-Casey (justincc) 2011-11-21 20:17:36 +00:00
parent 61848ebe0d
commit 4b2b0d4a05
1 changed files with 45 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
OpenSim/Region/Physics/OdePlugin/OdeScene.cs
View File

@ -1244,14 +1244,13 @@ namespace OpenSim.Region.Physics.OdePlugin
private bool checkDupe(d.ContactGeom contactGeom, int atype) private bool checkDupe(d.ContactGeom contactGeom, int atype)
{ {
bool result = false;
//return result;
if (!m_filterCollisions) if (!m_filterCollisions)
return false; return false;
bool result = false;
ActorTypes at = (ActorTypes)atype; ActorTypes at = (ActorTypes)atype;
lock (_perloopContact)
{
foreach (d.ContactGeom contact in _perloopContact) foreach (d.ContactGeom contact in _perloopContact)
{ {
//if ((contact.g1 == contactGeom.g1 && contact.g2 == contactGeom.g2)) //if ((contact.g1 == contactGeom.g1 && contact.g2 == contactGeom.g2))
@ -1304,10 +1303,6 @@ namespace OpenSim.Region.Physics.OdePlugin
} }
} }
//}
}
} }
return result; return result;