diff options
| author | Melanie | 2013-11-08 17:55:01 +0000 |
|---|---|---|
| committer | Melanie | 2013-11-08 17:55:01 +0000 |
| commit | 91b70bf3fe382729a94d9a0855be8b07ef67c360 (patch) | |
| tree | 3e42c4c536da6c7eaaf1a72ecdbd2a24de4d1658 /OpenSim/Region/Physics/BulletSPlugin/BulletSimData.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | If the LSL state_entry() event definition contains any parameters, then gener... (diff) | |
| download | opensim-SC-91b70bf3fe382729a94d9a0855be8b07ef67c360.zip opensim-SC-91b70bf3fe382729a94d9a0855be8b07ef67c360.tar.gz opensim-SC-91b70bf3fe382729a94d9a0855be8b07ef67c360.tar.bz2 opensim-SC-91b70bf3fe382729a94d9a0855be8b07ef67c360.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
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, |