Merge branch 'master' into ghosts

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.
2014-08-26 18:26:27 +01:00 · 2014-08-26 18:17:09 +01:00
1 changed files with 1 additions and 1 deletions
--- a/OpenSim/Region/Physics/BulletSPlugin/BulletSimData.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BulletSimData.cs
@@ -231,7 +231,7 @@ public static Dictionary<CollisionType, CollisionTypeFilterGroup> CollisionTypeM
    { CollisionType.Avatar,
                new CollisionTypeFilterGroup(CollisionType.Avatar,
                                (uint)CollisionFilterGroups.BCharacterGroup,
-                                (uint)CollisionFilterGroups.BAllGroup)
+                                (uint)(CollisionFilterGroups.BAllGroup & ~CollisionFilterGroups.BCharacterGroup))
    },
    { CollisionType.Groundplane,
                new CollisionTypeFilterGroup(CollisionType.Groundplane,
Author	SHA1	Message	Date
Justin Clark-Casey (justincc)	693bfdc0fb	Merge branch 'master' into ghosts	2014-08-26 18:26:27 +01:00
Justin Clark-Casey (justincc)	f3eaa6d81e	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.	2014-08-26 18:17:09 +01:00