diff options
| author | BlueWall | 2012-12-03 20:17:00 -0500 |
|---|---|---|
| committer | BlueWall | 2012-12-03 20:17:00 -0500 |
| commit | 0c7d6adef158d5cb25d8eb60287c5cb0cceaa953 (patch) | |
| tree | f766959f3442b78aa9202a4f61cf127508245345 /OpenSim/Region/Physics/BulletSPlugin/BSTerrainHeightmap.cs | |
| parent | XmlRpcGridRouter (diff) | |
| parent | BulletSim: Reduce idle region physics overhead where there are MANY (diff) | |
| download | opensim-SC-0c7d6adef158d5cb25d8eb60287c5cb0cceaa953.zip opensim-SC-0c7d6adef158d5cb25d8eb60287c5cb0cceaa953.tar.gz opensim-SC-0c7d6adef158d5cb25d8eb60287c5cb0cceaa953.tar.bz2 opensim-SC-0c7d6adef158d5cb25d8eb60287c5cb0cceaa953.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to '')
| -rwxr-xr-x | OpenSim/Region/Physics/BulletSPlugin/BSTerrainHeightmap.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSTerrainHeightmap.cs b/OpenSim/Region/Physics/BulletSPlugin/BSTerrainHeightmap.cs index 0cb151e..83b9c37 100755 --- a/OpenSim/Region/Physics/BulletSPlugin/BSTerrainHeightmap.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSTerrainHeightmap.cs | |||
| @@ -121,8 +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.SetCollisionFilterMask2(m_mapInfo.terrainBody.ptr, | 124 | BulletSimAPI.SetCollisionGroupMask2(m_mapInfo.terrainBody.ptr, |
| 125 | (uint)CollisionFilterGroups.TerrainFilter, | 125 | (uint)CollisionFilterGroups.TerrainGroup, |
| 126 | (uint)CollisionFilterGroups.TerrainMask); | 126 | (uint)CollisionFilterGroups.TerrainMask); |
| 127 | 127 | ||
| 128 | // Make it so the terrain will not move or be considered for movement. | 128 | // Make it so the terrain will not move or be considered for movement. |