diff options
| author | Robert Adams | 2012-10-15 12:11:00 -0700 |
|---|---|---|
| committer | Robert Adams | 2012-10-19 10:52:14 -0700 |
| commit | fc33afddd360843d05f030750b7075315a526ae1 (patch) | |
| tree | 69b48a3eaf800c9a3a24abaa0a12d8eb864bddc9 /OpenSim/Region/Physics/BulletSPlugin/BSTerrainManager.cs | |
| parent | BulletSim: Fix small problems with last patch: BSScene.World properly initial... (diff) | |
| download | opensim-SC-fc33afddd360843d05f030750b7075315a526ae1.zip opensim-SC-fc33afddd360843d05f030750b7075315a526ae1.tar.gz opensim-SC-fc33afddd360843d05f030750b7075315a526ae1.tar.bz2 opensim-SC-fc33afddd360843d05f030750b7075315a526ae1.tar.xz | |
BulletSim: remove code in ShapeCollection that hinted at shape sharing.
Add new function to ParameterDefn for calling BulletSimAPI to set values.
Tweaking to BSCharacter parameter setting to try and have avatars stand.
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSTerrainManager.cs')
| -rwxr-xr-x | OpenSim/Region/Physics/BulletSPlugin/BSTerrainManager.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSTerrainManager.cs b/OpenSim/Region/Physics/BulletSPlugin/BSTerrainManager.cs index caf411e..9743d94 100755 --- a/OpenSim/Region/Physics/BulletSPlugin/BSTerrainManager.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSTerrainManager.cs | |||
| @@ -334,7 +334,8 @@ public class BSTerrainManager | |||
| 334 | 334 | ||
| 335 | // Make sure the new shape is processed. | 335 | // Make sure the new shape is processed. |
| 336 | // BulletSimAPI.Activate2(mapInfo.terrainBody.ptr, true); | 336 | // BulletSimAPI.Activate2(mapInfo.terrainBody.ptr, true); |
| 337 | BulletSimAPI.ForceActivationState2(mapInfo.terrainBody.ptr, ActivationState.DISABLE_SIMULATION); | 337 | BulletSimAPI.ForceActivationState2(mapInfo.terrainBody.ptr, ActivationState.ISLAND_SLEEPING); |
| 338 | // BulletSimAPI.ForceActivationState2(mapInfo.terrainBody.ptr, ActivationState.DISABLE_SIMULATION); | ||
| 338 | 339 | ||
| 339 | m_terrainModified = true; | 340 | m_terrainModified = true; |
| 340 | }; | 341 | }; |