diff options
| author | Melanie | 2012-12-04 23:01:18 +0000 |
|---|---|---|
| committer | Melanie | 2012-12-04 23:01:18 +0000 |
| commit | 5837e731bfbd7ceafbd45aaf61c566440b25bf7e (patch) | |
| tree | 8ab9e0a345d5c5f281dc0b59085195f03126da12 /OpenSim/Region/Physics/BulletSPlugin/BSTerrainManager.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Bug fix in OfflineMessageModule. Mantis #6446 (diff) | |
| download | opensim-SC_OLD-5837e731bfbd7ceafbd45aaf61c566440b25bf7e.zip opensim-SC_OLD-5837e731bfbd7ceafbd45aaf61c566440b25bf7e.tar.gz opensim-SC_OLD-5837e731bfbd7ceafbd45aaf61c566440b25bf7e.tar.bz2 opensim-SC_OLD-5837e731bfbd7ceafbd45aaf61c566440b25bf7e.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
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 17d9536..83df360 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.SetCollisionFilterMask2(m_groundPlane.ptr, | 143 | BulletSimAPI.SetCollisionGroupMask2(m_groundPlane.ptr, |
| 144 | (uint)CollisionFilterGroups.GroundPlaneFilter, (uint)CollisionFilterGroups.GroundPlaneMask); | 144 | (uint)CollisionFilterGroups.GroundPlaneGroup, (uint)CollisionFilterGroups.GroundPlaneMask); |
| 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); |