diff options
| author | Justin Clark-Casey (justincc) | 2012-12-14 23:29:33 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2012-12-14 23:29:33 +0000 |
| commit | 2816551215958d866fca03906df4058cf0e4b19b (patch) | |
| tree | 26eeb122bb197ed89db22f7de0ef97ff4aedf025 /OpenSim/Region/Physics/BulletSPlugin/BSTerrainHeightmap.cs | |
| parent | Fix issue where calling llVolumeDetect(FALSE) would not remove phantom flag, ... (diff) | |
| parent | BulletSim: Add more to the TODO list. Clean up and improve some comments. (diff) | |
| download | opensim-SC_OLD-2816551215958d866fca03906df4058cf0e4b19b.zip opensim-SC_OLD-2816551215958d866fca03906df4058cf0e4b19b.tar.gz opensim-SC_OLD-2816551215958d866fca03906df4058cf0e4b19b.tar.bz2 opensim-SC_OLD-2816551215958d866fca03906df4058cf0e4b19b.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSTerrainHeightmap.cs')
| -rwxr-xr-x | OpenSim/Region/Physics/BulletSPlugin/BSTerrainHeightmap.cs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSTerrainHeightmap.cs b/OpenSim/Region/Physics/BulletSPlugin/BSTerrainHeightmap.cs index 2d379bb..2b120d6 100755 --- a/OpenSim/Region/Physics/BulletSPlugin/BSTerrainHeightmap.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSTerrainHeightmap.cs | |||
| @@ -121,9 +121,8 @@ public sealed class BSTerrainHeightmap : BSTerrainPhys | |||
| 121 | // redo its bounding box now that it is in the world | 121 | // redo its bounding box now that it is in the world |
| 122 | BulletSimAPI.UpdateSingleAabb2(PhysicsScene.World.ptr, m_mapInfo.terrainBody.ptr); | 122 | BulletSimAPI.UpdateSingleAabb2(PhysicsScene.World.ptr, m_mapInfo.terrainBody.ptr); |
| 123 | 123 | ||
| 124 | BulletSimAPI.SetCollisionGroupMask2(m_mapInfo.terrainBody.ptr, | 124 | m_mapInfo.terrainBody.collisionType = CollisionType.Terrain; |
| 125 | (uint)CollisionFilterGroups.TerrainGroup, | 125 | m_mapInfo.terrainBody.ApplyCollisionMask(); |
| 126 | (uint)CollisionFilterGroups.TerrainMask); | ||
| 127 | 126 | ||
| 128 | // Make it so the terrain will not move or be considered for movement. | 127 | // Make it so the terrain will not move or be considered for movement. |
| 129 | BulletSimAPI.ForceActivationState2(m_mapInfo.terrainBody.ptr, ActivationState.DISABLE_SIMULATION); | 128 | BulletSimAPI.ForceActivationState2(m_mapInfo.terrainBody.ptr, ActivationState.DISABLE_SIMULATION); |