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

Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork

avinationmerge
ubit 2013-01-26 07:13:39 +01:00
parent 2eab339b87 bfac09849f
commit fdc26b801e
1 changed files with 43 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs
View File

@ -1011,8 +1011,6 @@ namespace OpenSim.Region.Physics.OdePlugin
while (true) while (true)
{ {
if (m_global_contactcount >= maxContactsbeforedeath)
break;
// if (!(IgnoreNegSides && curContact.side1 < 0)) // if (!(IgnoreNegSides && curContact.side1 < 0))
{ {
@ -1032,9 +1030,15 @@ namespace OpenSim.Region.Physics.OdePlugin
if (noskip) if (noskip)
{ {
m_global_contactcount++; m_global_contactcount++;
if (m_global_contactcount >= maxContactsbeforedeath)
break;
ncontacts++; ncontacts++;
Joint = CreateContacJoint(ref curContact, mu, bounce, cfm, erpscale, dscale); Joint = CreateContacJoint(ref curContact, mu, bounce, cfm, erpscale, dscale);
if (Joint == IntPtr.Zero)
break;
d.JointAttach(Joint, b1, b2); d.JointAttach(Joint, b1, b2);
if (curContact.depth > maxContact.depth) if (curContact.depth > maxContact.depth)