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/BSTerrainManager.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 '')
| -rwxr-xr-x | OpenSim/Region/Physics/BulletSPlugin/BSTerrainManager.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSTerrainManager.cs b/OpenSim/Region/Physics/BulletSPlugin/BSTerrainManager.cs index c28d69d..5dbd8ce 100755 --- a/OpenSim/Region/Physics/BulletSPlugin/BSTerrainManager.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSTerrainManager.cs | |||
| @@ -140,8 +140,8 @@ public sealed class BSTerrainManager | |||
| 140 | // Ground plane does not move | 140 | // Ground plane does not move |
| 141 | BulletSimAPI.ForceActivationState2(m_groundPlane.ptr, ActivationState.DISABLE_SIMULATION); | 141 | BulletSimAPI.ForceActivationState2(m_groundPlane.ptr, ActivationState.DISABLE_SIMULATION); |
| 142 | // Everything collides with the ground plane. | 142 | // Everything collides with the ground plane. |
| 143 | BulletSimAPI.SetCollisionGroupMask2(m_groundPlane.ptr, | 143 | m_groundPlane.collisionType = CollisionType.Groundplane; |
| 144 | (uint)CollisionFilterGroups.GroundPlaneGroup, (uint)CollisionFilterGroups.GroundPlaneMask); | 144 | m_groundPlane.ApplyCollisionMask(); |
| 145 | 145 | ||
| 146 | // Build an initial terrain and put it in the world. This quickly gets replaced by the real region terrain. | 146 | // Build an initial terrain and put it in the world. This quickly gets replaced by the real region terrain. |
| 147 | BSTerrainPhys initialTerrain = new BSTerrainHeightmap(PhysicsScene, Vector3.Zero, BSScene.TERRAIN_ID, DefaultRegionSize); | 147 | BSTerrainPhys initialTerrain = new BSTerrainHeightmap(PhysicsScene, Vector3.Zero, BSScene.TERRAIN_ID, DefaultRegionSize); |