diff options
| author | UbitUmarov | 2012-07-15 15:40:23 +0100 |
|---|---|---|
| committer | UbitUmarov | 2012-07-15 15:40:23 +0100 |
| commit | 35a5a064b0253052a0f81ae7a1efebf64a21cac1 (patch) | |
| tree | 35867cee2e7ecad8df6d64e6760d9c528135fac9 /OpenSim/Region/Physics/UbitOdePlugin | |
| parent | messing around... Let terrain and water have nullphysicsactors, let (diff) | |
| parent | Eliminate a spurious exception report when a https url is accessed with a wrong (diff) | |
| download | opensim-SC-35a5a064b0253052a0f81ae7a1efebf64a21cac1.zip opensim-SC-35a5a064b0253052a0f81ae7a1efebf64a21cac1.tar.gz opensim-SC-35a5a064b0253052a0f81ae7a1efebf64a21cac1.tar.bz2 opensim-SC-35a5a064b0253052a0f81ae7a1efebf64a21cac1.tar.xz | |
Merge branch 'avination' into ubitwork
Diffstat (limited to 'OpenSim/Region/Physics/UbitOdePlugin')
| -rw-r--r-- | OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs b/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs index 1104f45..139c4e8 100644 --- a/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs +++ b/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs | |||
| @@ -1238,7 +1238,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
| 1238 | { | 1238 | { |
| 1239 | if (!prm.m_outbounds) | 1239 | if (!prm.m_outbounds) |
| 1240 | { | 1240 | { |
| 1241 | // if (d.BodyIsEnabled(prm.Body)) | 1241 | if (d.BodyIsEnabled(prm.Body)) |
| 1242 | d.SpaceCollide2(StaticSpace, prm.collide_geom, IntPtr.Zero, nearCallback); | 1242 | d.SpaceCollide2(StaticSpace, prm.collide_geom, IntPtr.Zero, nearCallback); |
| 1243 | } | 1243 | } |
| 1244 | } | 1244 | } |