diff options
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
Diffstat (limited to 'OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs')
| -rw-r--r-- | OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs b/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs index 03048a4..6592e6c 100644 --- a/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs +++ b/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs | |||
| @@ -718,7 +718,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
| 718 | 718 | ||
| 719 | if (b1 != IntPtr.Zero && b2 != IntPtr.Zero && d.AreConnectedExcluding(b1, b2, d.JointType.Contact)) | 719 | if (b1 != IntPtr.Zero && b2 != IntPtr.Zero && d.AreConnectedExcluding(b1, b2, d.JointType.Contact)) |
| 720 | return; | 720 | return; |
| 721 | 721 | /* | |
| 722 | // debug | 722 | // debug |
| 723 | PhysicsActor dp2; | 723 | PhysicsActor dp2; |
| 724 | if (d.GeomGetClass(g1) == d.GeomClassID.HeightfieldClass) | 724 | if (d.GeomGetClass(g1) == d.GeomClassID.HeightfieldClass) |
| @@ -742,7 +742,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
| 742 | } | 742 | } |
| 743 | } | 743 | } |
| 744 | // | 744 | // |
| 745 | 745 | */ | |
| 746 | 746 | ||
| 747 | 747 | ||
| 748 | if(d.GeomGetCategoryBits(g1) == (uint)CollisionCategories.VolumeDtc || | 748 | if(d.GeomGetCategoryBits(g1) == (uint)CollisionCategories.VolumeDtc || |