aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
diff options
context:
space:
mode:
authorRobert Adams2013-07-18 19:09:55 -0700
committerRobert Adams2013-07-18 19:09:55 -0700
commit1d65b0d80296a672c8023293aee7d0a01bad4066 (patch)
tree5455a7a3f66d8fee8c7fc9394fc0df880a834441 /OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
parentEnable storing of environment settings in NullSimulationData (diff)
downloadopensim-SC_OLD-1d65b0d80296a672c8023293aee7d0a01bad4066.zip
opensim-SC_OLD-1d65b0d80296a672c8023293aee7d0a01bad4066.tar.gz
opensim-SC_OLD-1d65b0d80296a672c8023293aee7d0a01bad4066.tar.bz2
opensim-SC_OLD-1d65b0d80296a672c8023293aee7d0a01bad4066.tar.xz
BulletSim: add position resetting for stationary avatars so they don't
move around when standing on a stationary object. Create proper linkage between BSCharacter and its actor by generating a UpdatedProperties event the same way BSPrim does.
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs')
-rw-r--r--OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs8
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
index c9e3ca0..59e7f5f 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
@@ -709,10 +709,10 @@ public sealed class BSCharacter : BSPhysObject
709 // the world that things have changed. 709 // the world that things have changed.
710 public override void UpdateProperties(EntityProperties entprop) 710 public override void UpdateProperties(EntityProperties entprop)
711 { 711 {
712 // Don't change position if standing on a stationary object. 712 // Let anyone (like the actors) modify the updated properties before they are pushed into the object and the simulator.
713 if (!IsStationary) 713 TriggerPreUpdatePropertyAction(ref entprop);
714 RawPosition = entprop.Position;
715 714
715 RawPosition = entprop.Position;
716 RawOrientation = entprop.Rotation; 716 RawOrientation = entprop.Rotation;
717 717
718 // Smooth velocity. OpenSimulator is VERY sensitive to changes in velocity of the avatar 718 // Smooth velocity. OpenSimulator is VERY sensitive to changes in velocity of the avatar
@@ -740,7 +740,7 @@ public sealed class BSCharacter : BSPhysObject
740 // Linkset.UpdateProperties(UpdatedProperties.EntPropUpdates, this); 740 // Linkset.UpdateProperties(UpdatedProperties.EntPropUpdates, this);
741 741
742 // Avatars don't report their changes the usual way. Changes are checked for in the heartbeat loop. 742 // Avatars don't report their changes the usual way. Changes are checked for in the heartbeat loop.
743 // base.RequestPhysicsterseUpdate(); 743 // PhysScene.PostUpdate(this);
744 744
745 DetailLog("{0},BSCharacter.UpdateProperties,call,pos={1},orient={2},vel={3},accel={4},rotVel={5}", 745 DetailLog("{0},BSCharacter.UpdateProperties,call,pos={1},orient={2},vel={3},accel={4},rotVel={5}",
746 LocalID, RawPosition, RawOrientation, RawVelocity, _acceleration, _rotationalVelocity); 746 LocalID, RawPosition, RawOrientation, RawVelocity, _acceleration, _rotationalVelocity);