diff options
| author | Robert Adams | 2013-10-28 09:30:26 -0700 |
|---|---|---|
| committer | Robert Adams | 2013-10-28 09:30:26 -0700 |
| commit | 2be0347f5044ec723748c53db9290f3cf8bc431a (patch) | |
| tree | b52812ac7fcdcd8a7a985094e14ca3d461a39673 /OpenSim/Region/Physics/BulletSPlugin/BulletSimData.cs | |
| parent | varregion: update PGSQL driver for storing variable terrain size blobs. (diff) | |
| parent | BulletSim: restore collision flags when clear collision cache. (diff) | |
| download | opensim-SC_OLD-2be0347f5044ec723748c53db9290f3cf8bc431a.zip opensim-SC_OLD-2be0347f5044ec723748c53db9290f3cf8bc431a.tar.gz opensim-SC_OLD-2be0347f5044ec723748c53db9290f3cf8bc431a.tar.bz2 opensim-SC_OLD-2be0347f5044ec723748c53db9290f3cf8bc431a.tar.xz | |
Merge branch 'master' into varregion
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, |