diff options
| author | Robert Adams | 2012-12-13 12:42:25 -0800 |
|---|---|---|
| committer | Robert Adams | 2012-12-13 16:32:06 -0800 |
| commit | 3b2b785a461eba34c26a45be246c2baef2820e39 (patch) | |
| tree | 10f25858b084edcd6e58af0fb220b893260ddf5d /OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs | |
| parent | BulletSim: remove extra linkset rebuilds. (diff) | |
| download | opensim-SC_OLD-3b2b785a461eba34c26a45be246c2baef2820e39.zip opensim-SC_OLD-3b2b785a461eba34c26a45be246c2baef2820e39.tar.gz opensim-SC_OLD-3b2b785a461eba34c26a45be246c2baef2820e39.tar.bz2 opensim-SC_OLD-3b2b785a461eba34c26a45be246c2baef2820e39.tar.xz | |
BulletSim: Add 'BulletSimData' which separates structures created
for the operation of BulletSim and those defintiions/structures defined
so they can be used in the unmanaged world.
Consolidate setting of collision flags so implementation is not scattered.
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() |