diff options
| author | BlueWall | 2012-12-12 16:15:32 -0500 |
|---|---|---|
| committer | BlueWall | 2012-12-12 16:15:32 -0500 |
| commit | c5d333c16cddbcbcceb1ed0bc937e5775c99c2bc (patch) | |
| tree | 644d21cbd5b7e86d9ba3316979fd9a85bc028f51 /OpenSim/Region/Physics/BulletSPlugin/BSTerrainHeightmap.cs | |
| parent | Replace Mono.Addins libraries (diff) | |
| parent | BulletSim: do not return the current velocity for targetVelocity. (diff) | |
| download | opensim-SC_OLD-c5d333c16cddbcbcceb1ed0bc937e5775c99c2bc.zip opensim-SC_OLD-c5d333c16cddbcbcceb1ed0bc937e5775c99c2bc.tar.gz opensim-SC_OLD-c5d333c16cddbcbcceb1ed0bc937e5775c99c2bc.tar.bz2 opensim-SC_OLD-c5d333c16cddbcbcceb1ed0bc937e5775c99c2bc.tar.xz | |
Merge branch 'master' of /home/opensim/var/repo/opensim
Diffstat (limited to '')
| -rwxr-xr-x | OpenSim/Region/Physics/BulletSPlugin/BSTerrainHeightmap.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSTerrainHeightmap.cs b/OpenSim/Region/Physics/BulletSPlugin/BSTerrainHeightmap.cs index 83b9c37..2d379bb 100755 --- a/OpenSim/Region/Physics/BulletSPlugin/BSTerrainHeightmap.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSTerrainHeightmap.cs | |||
| @@ -136,7 +136,7 @@ public sealed class BSTerrainHeightmap : BSTerrainPhys | |||
| 136 | { | 136 | { |
| 137 | if (m_mapInfo != null) | 137 | if (m_mapInfo != null) |
| 138 | { | 138 | { |
| 139 | if (m_mapInfo.terrainBody.ptr != IntPtr.Zero) | 139 | if (m_mapInfo.terrainBody.HasPhysicalBody) |
| 140 | { | 140 | { |
| 141 | BulletSimAPI.RemoveObjectFromWorld2(PhysicsScene.World.ptr, m_mapInfo.terrainBody.ptr); | 141 | BulletSimAPI.RemoveObjectFromWorld2(PhysicsScene.World.ptr, m_mapInfo.terrainBody.ptr); |
| 142 | // Frees both the body and the shape. | 142 | // Frees both the body and the shape. |