1 files changed, 21 insertions, 21 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BulletSimData.cs b/OpenSim/Region/Physics/BulletSPlugin/BulletSimData.cs
index 906e4f9..d5060e3 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BulletSimData.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BulletSimData.cs
@@ -224,42 +224,42 @@ public static class BulletSimData
 // As mentioned above, don't use the CollisionFilterGroups definitions directly in the code
 //     but, instead, use references to this dictionary. Finding and debugging
 //     collision flag problems will be made easier.
-public static Dictionary<CollisionType, CollisionTypeFilterGroup> CollisionTypeMasks 
+public static Dictionary<CollisionType, CollisionTypeFilterGroup> CollisionTypeMasks
            = new Dictionary<CollisionType, CollisionTypeFilterGroup>()
 {
-    { CollisionType.Avatar, 
+    { CollisionType.Avatar,
-                new CollisionTypeFilterGroup(CollisionType.Avatar, 
+                new CollisionTypeFilterGroup(CollisionType.Avatar,
-                                (uint)CollisionFilterGroups.BCharacterGroup, 
+                                (uint)CollisionFilterGroups.BCharacterGroup,
                                (uint)CollisionFilterGroups.BAllGroup)
    },
-    { CollisionType.Groundplane, 
+    { CollisionType.Groundplane,
-                new CollisionTypeFilterGroup(CollisionType.Groundplane, 
+                new CollisionTypeFilterGroup(CollisionType.Groundplane,
-                                (uint)CollisionFilterGroups.BGroundPlaneGroup, 
+                                (uint)CollisionFilterGroups.BGroundPlaneGroup,
                                (uint)CollisionFilterGroups.BAllGroup)
    },
-    { CollisionType.Terrain, 
+    { CollisionType.Terrain,
-                new CollisionTypeFilterGroup(CollisionType.Terrain, 
+                new CollisionTypeFilterGroup(CollisionType.Terrain,
-                                (uint)CollisionFilterGroups.BTerrainGroup, 
+                                (uint)CollisionFilterGroups.BTerrainGroup,
                                (uint)(CollisionFilterGroups.BAllGroup & ~CollisionFilterGroups.BStaticGroup))
    },
-    { CollisionType.Static, 
+    { CollisionType.Static,
-                new CollisionTypeFilterGroup(CollisionType.Static, 
+                new CollisionTypeFilterGroup(CollisionType.Static,
-                                (uint)CollisionFilterGroups.BStaticGroup, 
+                                (uint)CollisionFilterGroups.BStaticGroup,
                                (uint)(CollisionFilterGroups.BCharacterGroup | CollisionFilterGroups.BSolidGroup))
    },
-    { CollisionType.Dynamic, 
+    { CollisionType.Dynamic,
-                new CollisionTypeFilterGroup(CollisionType.Dynamic, 
+                new CollisionTypeFilterGroup(CollisionType.Dynamic,
-                                (uint)CollisionFilterGroups.BSolidGroup, 
+                                (uint)CollisionFilterGroups.BSolidGroup,
                                (uint)(CollisionFilterGroups.BAllGroup))
    },
-    { CollisionType.VolumeDetect, 
+    { CollisionType.VolumeDetect,
-                new CollisionTypeFilterGroup(CollisionType.VolumeDetect, 
+                new CollisionTypeFilterGroup(CollisionType.VolumeDetect,
-                                (uint)CollisionFilterGroups.BSensorTrigger, 
+                                (uint)CollisionFilterGroups.BSensorTrigger,
                                (uint)(~CollisionFilterGroups.BSensorTrigger))
    },
    { CollisionType.LinksetChild,
-                new CollisionTypeFilterGroup(CollisionType.LinksetChild, 
+                new CollisionTypeFilterGroup(CollisionType.LinksetChild,
-                                (uint)CollisionFilterGroups.BLinksetChildGroup, 
+                                (uint)CollisionFilterGroups.BLinksetChildGroup,
                                (uint)(CollisionFilterGroups.BNoneGroup))
                                // (uint)(CollisionFilterGroups.BCharacterGroup | CollisionFilterGroups.BSolidGroup))
    },

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BulletSimData.cs b/OpenSim/Region/Physics/BulletSPlugin/BulletSimData.cs index 906e4f9..d5060e3 100755 --- a/OpenSim/Region/Physics/BulletSPlugin/BulletSimData.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BulletSimData.cs
@@ -224,42 +224,42 @@ public static class BulletSimData
224	// As mentioned above, don't use the CollisionFilterGroups definitions directly in the code	224	// As mentioned above, don't use the CollisionFilterGroups definitions directly in the code
225	// but, instead, use references to this dictionary. Finding and debugging	225	// but, instead, use references to this dictionary. Finding and debugging
226	// collision flag problems will be made easier.	226	// collision flag problems will be made easier.
227	public static Dictionary<CollisionType, CollisionTypeFilterGroup> CollisionTypeMasks	227	public static Dictionary<CollisionType, CollisionTypeFilterGroup> CollisionTypeMasks
228	= new Dictionary<CollisionType, CollisionTypeFilterGroup>()	228	= new Dictionary<CollisionType, CollisionTypeFilterGroup>()
229	{	229	{
230	{ CollisionType.Avatar,	230	{ CollisionType.Avatar,
231	new CollisionTypeFilterGroup(CollisionType.Avatar,	231	new CollisionTypeFilterGroup(CollisionType.Avatar,
232	(uint)CollisionFilterGroups.BCharacterGroup,	232	(uint)CollisionFilterGroups.BCharacterGroup,
233	(uint)CollisionFilterGroups.BAllGroup)	233	(uint)CollisionFilterGroups.BAllGroup)
234	},	234	},
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	},	239	},
240	{ CollisionType.Terrain,	240	{ CollisionType.Terrain,
241	new CollisionTypeFilterGroup(CollisionType.Terrain,	241	new CollisionTypeFilterGroup(CollisionType.Terrain,
242	(uint)CollisionFilterGroups.BTerrainGroup,	242	(uint)CollisionFilterGroups.BTerrainGroup,
243	(uint)(CollisionFilterGroups.BAllGroup & ~CollisionFilterGroups.BStaticGroup))	243	(uint)(CollisionFilterGroups.BAllGroup & ~CollisionFilterGroups.BStaticGroup))
244	},	244	},
245	{ CollisionType.Static,	245	{ CollisionType.Static,
246	new CollisionTypeFilterGroup(CollisionType.Static,	246	new CollisionTypeFilterGroup(CollisionType.Static,
247	(uint)CollisionFilterGroups.BStaticGroup,	247	(uint)CollisionFilterGroups.BStaticGroup,
248	(uint)(CollisionFilterGroups.BCharacterGroup \| CollisionFilterGroups.BSolidGroup))	248	(uint)(CollisionFilterGroups.BCharacterGroup \| CollisionFilterGroups.BSolidGroup))
249	},	249	},
250	{ CollisionType.Dynamic,	250	{ CollisionType.Dynamic,
251	new CollisionTypeFilterGroup(CollisionType.Dynamic,	251	new CollisionTypeFilterGroup(CollisionType.Dynamic,
252	(uint)CollisionFilterGroups.BSolidGroup,	252	(uint)CollisionFilterGroups.BSolidGroup,
253	(uint)(CollisionFilterGroups.BAllGroup))	253	(uint)(CollisionFilterGroups.BAllGroup))
254	},	254	},
255	{ CollisionType.VolumeDetect,	255	{ CollisionType.VolumeDetect,
256	new CollisionTypeFilterGroup(CollisionType.VolumeDetect,	256	new CollisionTypeFilterGroup(CollisionType.VolumeDetect,
257	(uint)CollisionFilterGroups.BSensorTrigger,	257	(uint)CollisionFilterGroups.BSensorTrigger,
258	(uint)(~CollisionFilterGroups.BSensorTrigger))	258	(uint)(~CollisionFilterGroups.BSensorTrigger))
259	},	259	},
260	{ CollisionType.LinksetChild,	260	{ CollisionType.LinksetChild,
261	new CollisionTypeFilterGroup(CollisionType.LinksetChild,	261	new CollisionTypeFilterGroup(CollisionType.LinksetChild,
262	(uint)CollisionFilterGroups.BLinksetChildGroup,	262	(uint)CollisionFilterGroups.BLinksetChildGroup,
263	(uint)(CollisionFilterGroups.BNoneGroup))	263	(uint)(CollisionFilterGroups.BNoneGroup))
264	// (uint)(CollisionFilterGroups.BCharacterGroup \| CollisionFilterGroups.BSolidGroup))	264	// (uint)(CollisionFilterGroups.BCharacterGroup \| CollisionFilterGroups.BSolidGroup))
265	},	265	},