diff options
| author | UbitUmarov | 2017-04-18 05:31:15 +0100 |
|---|---|---|
| committer | UbitUmarov | 2017-04-18 05:31:15 +0100 |
| commit | 006c08886a2af6d2287e6ef8bc67428b61ff9998 (patch) | |
| tree | f0aec346384dc259fc7d008ccf7cf290acb98281 /OpenSim/Region/PhysicsModules/ubOde/ODEScene.cs | |
| parent | update ODE binaries for windows. Other platforms need to compile from opensi... (diff) | |
| download | opensim-SC_OLD-006c08886a2af6d2287e6ef8bc67428b61ff9998.zip opensim-SC_OLD-006c08886a2af6d2287e6ef8bc67428b61ff9998.tar.gz opensim-SC_OLD-006c08886a2af6d2287e6ef8bc67428b61ff9998.tar.bz2 opensim-SC_OLD-006c08886a2af6d2287e6ef8bc67428b61ff9998.tar.xz | |
deleted a bit 2 much on last commit
Diffstat (limited to 'OpenSim/Region/PhysicsModules/ubOde/ODEScene.cs')
| -rw-r--r-- | OpenSim/Region/PhysicsModules/ubOde/ODEScene.cs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Region/PhysicsModules/ubOde/ODEScene.cs b/OpenSim/Region/PhysicsModules/ubOde/ODEScene.cs index a4c3f92..be652c0 100644 --- a/OpenSim/Region/PhysicsModules/ubOde/ODEScene.cs +++ b/OpenSim/Region/PhysicsModules/ubOde/ODEScene.cs | |||
| @@ -727,8 +727,8 @@ namespace OpenSim.Region.PhysicsModule.ubOde | |||
| 727 | if (g1 == g2) | 727 | if (g1 == g2) |
| 728 | return; // Can't collide with yourself | 728 | return; // Can't collide with yourself |
| 729 | 729 | ||
| 730 | if (b1 != IntPtr.Zero && b2 != IntPtr.Zero && d.AreConnectedExcluding(b1, b2, d.JointType.Contact)) | 730 | // if (b1 != IntPtr.Zero && b2 != IntPtr.Zero && d.AreConnectedExcluding(b1, b2, d.JointType.Contact)) |
| 731 | return; | 731 | // return; |
| 732 | /* | 732 | /* |
| 733 | // debug | 733 | // debug |
| 734 | PhysicsActor dp2; | 734 | PhysicsActor dp2; |
| @@ -1176,6 +1176,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde | |||
| 1176 | aprim.clearSleeperCollisions(); | 1176 | aprim.clearSleeperCollisions(); |
| 1177 | } | 1177 | } |
| 1178 | } | 1178 | } |
| 1179 | |||
| 1179 | lock (_activegroups) | 1180 | lock (_activegroups) |
| 1180 | { | 1181 | { |
| 1181 | try | 1182 | try |