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/BSTerrainMesh.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Bug fix in OfflineMessageModule. Mantis #6446 (diff) | |
| download | opensim-SC-5837e731bfbd7ceafbd45aaf61c566440b25bf7e.zip opensim-SC-5837e731bfbd7ceafbd45aaf61c566440b25bf7e.tar.gz opensim-SC-5837e731bfbd7ceafbd45aaf61c566440b25bf7e.tar.bz2 opensim-SC-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/BSTerrainMesh.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSTerrainMesh.cs b/OpenSim/Region/Physics/BulletSPlugin/BSTerrainMesh.cs index 7e93ab4..6ce767d 100755 --- a/OpenSim/Region/Physics/BulletSPlugin/BSTerrainMesh.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSTerrainMesh.cs | |||
| @@ -130,8 +130,8 @@ public sealed class BSTerrainMesh : BSTerrainPhys | |||
| 130 | // Redo its bounding box now that it is in the world | 130 | // Redo its bounding box now that it is in the world |
| 131 | BulletSimAPI.UpdateSingleAabb2(PhysicsScene.World.ptr, m_terrainBody.ptr); | 131 | BulletSimAPI.UpdateSingleAabb2(PhysicsScene.World.ptr, m_terrainBody.ptr); |
| 132 | 132 | ||
| 133 | BulletSimAPI.SetCollisionFilterMask2(m_terrainBody.ptr, | 133 | BulletSimAPI.SetCollisionGroupMask2(m_terrainBody.ptr, |
| 134 | (uint)CollisionFilterGroups.TerrainFilter, | 134 | (uint)CollisionFilterGroups.TerrainGroup, |
| 135 | (uint)CollisionFilterGroups.TerrainMask); | 135 | (uint)CollisionFilterGroups.TerrainMask); |
| 136 | 136 | ||
| 137 | // Make it so the terrain will not move or be considered for movement. | 137 | // Make it so the terrain will not move or be considered for movement. |