aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
diff options
context:
space:
mode:
authorRobert Adams2013-08-12 13:44:53 -0700
committerRobert Adams2013-08-12 13:44:53 -0700
commit2c31fe4614fc193f2600b36eac892ceee86f61e0 (patch)
tree3a986998ebbd3278e848bb61fc5787f6410f9838 /OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
parentDon't try and send group updates to NPCs via event queue, since NPCs have no ... (diff)
downloadopensim-SC_OLD-2c31fe4614fc193f2600b36eac892ceee86f61e0.zip
opensim-SC_OLD-2c31fe4614fc193f2600b36eac892ceee86f61e0.tar.gz
opensim-SC_OLD-2c31fe4614fc193f2600b36eac892ceee86f61e0.tar.bz2
opensim-SC_OLD-2c31fe4614fc193f2600b36eac892ceee86f61e0.tar.xz
BulletSim: add check in avatar stair step code to verify the collision
is not with a volume detect object. This fixes a problem of avatars trying to step over a volume detect object that they collide with. This appeared as the avatar popping up as it started to step up but then continuing on since the object wasn't physically interacting.
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs4
1 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
index a0b6abc..6b5dea3 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
@@ -617,6 +617,10 @@ public class BSPrim : BSPhysObject
617 } 617 }
618 return; 618 return;
619 } 619 }
620 public override bool IsVolumeDetect
621 {
622 get { return _isVolumeDetect; }
623 }
620 public override void SetMaterial(int material) 624 public override void SetMaterial(int material)
621 { 625 {
622 base.SetMaterial(material); 626 base.SetMaterial(material);