From c5a0f0ba368a8013a1976315d1d5e349547d58e9 Mon Sep 17 00:00:00 2001 From: Justin Clark-Casey (justincc) Date: Tue, 26 Aug 2014 18:17:09 +0100 Subject: 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. --- OpenSim/Region/Physics/BulletSPlugin/BulletSimData.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'OpenSim/Region/Physics/BulletSPlugin') 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 CollisionTypeM { CollisionType.Avatar, new CollisionTypeFilterGroup(CollisionType.Avatar, (uint)CollisionFilterGroups.BCharacterGroup, - (uint)CollisionFilterGroups.BAllGroup) + (uint)(CollisionFilterGroups.BAllGroup & ~CollisionFilterGroups.BCharacterGroup)) }, { CollisionType.Groundplane, new CollisionTypeFilterGroup(CollisionType.Groundplane, -- cgit v1.1