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

deleted a bit 2 much on last commit

httptests
UbitUmarov 2017-04-18 05:31:15 +01:00
parent 49884b94a7
commit 006c08886a
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3380,6 +3380,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
enableBodySoft(); enableBodySoft();
else if (!d.BodyIsEnabled(Body)) else if (!d.BodyIsEnabled(Body))
d.BodyEnable(Body); d.BodyEnable(Body);
d.BodySetLinearVel(Body, newVel.X, newVel.Y, newVel.Z);
} }
//resetCollisionAccounting(); //resetCollisionAccounting();
} }
@ -3403,6 +3404,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
enableBodySoft(); enableBodySoft();
else if (!d.BodyIsEnabled(Body)) else if (!d.BodyIsEnabled(Body))
d.BodyEnable(Body); d.BodyEnable(Body);
d.BodySetAngularVel(Body, newAngVel.X, newAngVel.Y, newAngVel.Z);
} }
//resetCollisionAccounting(); //resetCollisionAccounting();
} }

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

@ -727,8 +727,8 @@ namespace OpenSim.Region.PhysicsModule.ubOde
if (g1 == g2) if (g1 == g2)
return; // Can't collide with yourself return; // Can't collide with yourself
if (b1 != IntPtr.Zero && b2 != IntPtr.Zero && d.AreConnectedExcluding(b1, b2, d.JointType.Contact)) // if (b1 != IntPtr.Zero && b2 != IntPtr.Zero && d.AreConnectedExcluding(b1, b2, d.JointType.Contact))
return; // return;
/* /*
// debug // debug
PhysicsActor dp2; PhysicsActor dp2;
@ -1176,6 +1176,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
aprim.clearSleeperCollisions(); aprim.clearSleeperCollisions();
} }
} }
lock (_activegroups) lock (_activegroups)
{ {
try try