diff options
| author | Robert Adams | 2013-01-07 16:04:21 -0800 |
|---|---|---|
| committer | Robert Adams | 2013-01-07 16:04:21 -0800 |
| commit | 599dbc3d9556b7e2693ba61d7e234ef943ebad6d (patch) | |
| tree | 3a612214698eb3a1329865664801d63f7961e59d /OpenSim | |
| parent | BulletSim: comments and removing small compile errors introduced in last commit. (diff) | |
| download | opensim-SC-599dbc3d9556b7e2693ba61d7e234ef943ebad6d.zip opensim-SC-599dbc3d9556b7e2693ba61d7e234ef943ebad6d.tar.gz opensim-SC-599dbc3d9556b7e2693ba61d7e234ef943ebad6d.tar.bz2 opensim-SC-599dbc3d9556b7e2693ba61d7e234ef943ebad6d.tar.xz | |
BulletSim: fix exception when re-creating the terrain when loading an OAR file
Diffstat (limited to 'OpenSim')
| -rwxr-xr-x | OpenSim/Region/Physics/BulletSPlugin/BSTerrainMesh.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSTerrainMesh.cs b/OpenSim/Region/Physics/BulletSPlugin/BSTerrainMesh.cs index 1d55ce3..8244f02 100755 --- a/OpenSim/Region/Physics/BulletSPlugin/BSTerrainMesh.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSTerrainMesh.cs | |||
| @@ -142,6 +142,8 @@ public sealed class BSTerrainMesh : BSTerrainPhys | |||
| 142 | PhysicsScene.PE.RemoveObjectFromWorld(PhysicsScene.World, m_terrainBody); | 142 | PhysicsScene.PE.RemoveObjectFromWorld(PhysicsScene.World, m_terrainBody); |
| 143 | // Frees both the body and the shape. | 143 | // Frees both the body and the shape. |
| 144 | PhysicsScene.PE.DestroyObject(PhysicsScene.World, m_terrainBody); | 144 | PhysicsScene.PE.DestroyObject(PhysicsScene.World, m_terrainBody); |
| 145 | m_terrainBody.Clear(); | ||
| 146 | m_terrainShape.Clear(); | ||
| 145 | } | 147 | } |
| 146 | } | 148 | } |
| 147 | 149 | ||