diff options
| author | Justin Clark-Casey (justincc) | 2014-08-26 18:17:09 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2014-11-25 23:18:37 +0000 |
| commit | c5a0f0ba368a8013a1976315d1d5e349547d58e9 (patch) | |
| tree | bc89db033a14bbb09bb7c9bfedd3ef6149acd89d /OpenSim/Region | |
| parent | Re-work handling of email notifications settings. (diff) | |
| download | opensim-SC_OLD-c5a0f0ba368a8013a1976315d1d5e349547d58e9.zip opensim-SC_OLD-c5a0f0ba368a8013a1976315d1d5e349547d58e9.tar.gz opensim-SC_OLD-c5a0f0ba368a8013a1976315d1d5e349547d58e9.tar.bz2 opensim-SC_OLD-c5a0f0ba368a8013a1976315d1d5e349547d58e9.tar.xz | |
Temporary hack to disable av to av collisions in bulletsim.
Need to do this for a test. Final implementation will be properly controlled through a property.
Diffstat (limited to 'OpenSim/Region')
| -rwxr-xr-x | OpenSim/Region/Physics/BulletSPlugin/BulletSimData.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BulletSimData.cs b/OpenSim/Region/Physics/BulletSPlugin/BulletSimData.cs index 3425d9e..85ef64b 100755 --- a/OpenSim/Region/Physics/BulletSPlugin/BulletSimData.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BulletSimData.cs | |||
| @@ -231,7 +231,7 @@ public static Dictionary<CollisionType, CollisionTypeFilterGroup> CollisionTypeM | |||
| 231 | { CollisionType.Avatar, | 231 | { CollisionType.Avatar, |
| 232 | new CollisionTypeFilterGroup(CollisionType.Avatar, | 232 | new CollisionTypeFilterGroup(CollisionType.Avatar, |
| 233 | (uint)CollisionFilterGroups.BCharacterGroup, | 233 | (uint)CollisionFilterGroups.BCharacterGroup, |
| 234 | (uint)CollisionFilterGroups.BAllGroup) | 234 | (uint)(CollisionFilterGroups.BAllGroup & ~CollisionFilterGroups.BCharacterGroup)) |
| 235 | }, | 235 | }, |
| 236 | { CollisionType.Groundplane, | 236 | { CollisionType.Groundplane, |
| 237 | new CollisionTypeFilterGroup(CollisionType.Groundplane, | 237 | new CollisionTypeFilterGroup(CollisionType.Groundplane, |