diff options
| author | Melanie | 2012-12-04 23:01:18 +0000 |
|---|---|---|
| committer | Melanie | 2012-12-04 23:01:18 +0000 |
| commit | 5837e731bfbd7ceafbd45aaf61c566440b25bf7e (patch) | |
| tree | 8ab9e0a345d5c5f281dc0b59085195f03126da12 /OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Bug fix in OfflineMessageModule. Mantis #6446 (diff) | |
| download | opensim-SC-5837e731bfbd7ceafbd45aaf61c566440b25bf7e.zip opensim-SC-5837e731bfbd7ceafbd45aaf61c566440b25bf7e.tar.gz opensim-SC-5837e731bfbd7ceafbd45aaf61c566440b25bf7e.tar.bz2 opensim-SC-5837e731bfbd7ceafbd45aaf61c566440b25bf7e.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs index 1dfc420..21aa9be 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs | |||
| @@ -165,8 +165,8 @@ public sealed class BSCharacter : BSPhysObject | |||
| 165 | BulletSimAPI.UpdateSingleAabb2(PhysicsScene.World.ptr, PhysBody.ptr); | 165 | BulletSimAPI.UpdateSingleAabb2(PhysicsScene.World.ptr, PhysBody.ptr); |
| 166 | 166 | ||
| 167 | // Do this after the object has been added to the world | 167 | // Do this after the object has been added to the world |
| 168 | BulletSimAPI.SetCollisionFilterMask2(PhysBody.ptr, | 168 | BulletSimAPI.SetCollisionGroupMask2(PhysBody.ptr, |
| 169 | (uint)CollisionFilterGroups.AvatarFilter, | 169 | (uint)CollisionFilterGroups.AvatarGroup, |
| 170 | (uint)CollisionFilterGroups.AvatarMask); | 170 | (uint)CollisionFilterGroups.AvatarMask); |
| 171 | } | 171 | } |
| 172 | 172 | ||