diff options
| author | Justin Clark-Casey (justincc) | 2012-12-14 23:29:33 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2012-12-14 23:29:33 +0000 |
| commit | 2816551215958d866fca03906df4058cf0e4b19b (patch) | |
| tree | 26eeb122bb197ed89db22f7de0ef97ff4aedf025 /OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs | |
| parent | Fix issue where calling llVolumeDetect(FALSE) would not remove phantom flag, ... (diff) | |
| parent | BulletSim: Add more to the TODO list. Clean up and improve some comments. (diff) | |
| download | opensim-SC_OLD-2816551215958d866fca03906df4058cf0e4b19b.zip opensim-SC_OLD-2816551215958d866fca03906df4058cf0e4b19b.tar.gz opensim-SC_OLD-2816551215958d866fca03906df4058cf0e4b19b.tar.bz2 opensim-SC_OLD-2816551215958d866fca03906df4058cf0e4b19b.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs')
| -rw-r--r-- | OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs index c8aad8d..0defb24 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs | |||
| @@ -167,9 +167,8 @@ public sealed class BSCharacter : BSPhysObject | |||
| 167 | BulletSimAPI.UpdateSingleAabb2(PhysicsScene.World.ptr, PhysBody.ptr); | 167 | BulletSimAPI.UpdateSingleAabb2(PhysicsScene.World.ptr, PhysBody.ptr); |
| 168 | 168 | ||
| 169 | // Do this after the object has been added to the world | 169 | // Do this after the object has been added to the world |
| 170 | BulletSimAPI.SetCollisionGroupMask2(PhysBody.ptr, | 170 | PhysBody.collisionType = CollisionType.Avatar; |
| 171 | (uint)CollisionFilterGroups.AvatarGroup, | 171 | PhysBody.ApplyCollisionMask(); |
| 172 | (uint)CollisionFilterGroups.AvatarMask); | ||
| 173 | } | 172 | } |
| 174 | 173 | ||
| 175 | public override void RequestPhysicsterseUpdate() | 174 | public override void RequestPhysicsterseUpdate() |