diff options
author | Robert Adams | 2013-10-23 16:07:03 -0700 |
---|---|---|
committer | Robert Adams | 2013-10-23 16:07:03 -0700 |
commit | 511122834b5cd95839029d28365e479dc25eae9d (patch) | |
tree | 993b755b9f82dab3e225b26f5f12dc29778f0f17 /OpenSim/Region/Physics/BulletSPlugin/BulletSimData.cs | |
parent | Add current .NET windows framework requirement to README. (diff) | |
download | opensim-SC-511122834b5cd95839029d28365e479dc25eae9d.zip opensim-SC-511122834b5cd95839029d28365e479dc25eae9d.tar.gz opensim-SC-511122834b5cd95839029d28365e479dc25eae9d.tar.bz2 opensim-SC-511122834b5cd95839029d28365e479dc25eae9d.tar.xz |
BulletSim: change collision flags for groundplane to not interact with static objects.
Reorder collision flag setting code for terrain to fit pattern used elsewhere.
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BulletSimData.cs')
-rwxr-xr-x | OpenSim/Region/Physics/BulletSPlugin/BulletSimData.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BulletSimData.cs b/OpenSim/Region/Physics/BulletSPlugin/BulletSimData.cs index d5060e3..971ff9f 100755 --- a/OpenSim/Region/Physics/BulletSPlugin/BulletSimData.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BulletSimData.cs | |||
@@ -235,7 +235,8 @@ public static Dictionary<CollisionType, CollisionTypeFilterGroup> CollisionTypeM | |||
235 | { CollisionType.Groundplane, | 235 | { CollisionType.Groundplane, |
236 | new CollisionTypeFilterGroup(CollisionType.Groundplane, | 236 | new CollisionTypeFilterGroup(CollisionType.Groundplane, |
237 | (uint)CollisionFilterGroups.BGroundPlaneGroup, | 237 | (uint)CollisionFilterGroups.BGroundPlaneGroup, |
238 | (uint)CollisionFilterGroups.BAllGroup) | 238 | // (uint)CollisionFilterGroups.BAllGroup) |
239 | (uint)(CollisionFilterGroups.BCharacterGroup | CollisionFilterGroups.BSolidGroup)) | ||
239 | }, | 240 | }, |
240 | { CollisionType.Terrain, | 241 | { CollisionType.Terrain, |
241 | new CollisionTypeFilterGroup(CollisionType.Terrain, | 242 | new CollisionTypeFilterGroup(CollisionType.Terrain, |