aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/PhysicsModules/BulletS/BSCharacter.cs
diff options
context:
space:
mode:
authorRobert Adams2017-08-28 15:23:32 -0700
committerRobert Adams2017-08-28 15:23:32 -0700
commit5c36561424c8b093e24c683c2ff6e83410739388 (patch)
tree46290aa706661d88dc1c55b9181de630efc8eba7 /OpenSim/Region/PhysicsModules/BulletS/BSCharacter.cs
parentfrozen avatars should not do local teleports. Possible none should not be all... (diff)
downloadopensim-SC-5c36561424c8b093e24c683c2ff6e83410739388.zip
opensim-SC-5c36561424c8b093e24c683c2ff6e83410739388.tar.gz
opensim-SC-5c36561424c8b093e24c683c2ff6e83410739388.tar.bz2
opensim-SC-5c36561424c8b093e24c683c2ff6e83410739388.tar.xz
BulletSim: add clock and change logic for taint processing a little
so taints check if they are not in simulation time and execute immediately if not.
Diffstat (limited to 'OpenSim/Region/PhysicsModules/BulletS/BSCharacter.cs')
-rw-r--r--OpenSim/Region/PhysicsModules/BulletS/BSCharacter.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/PhysicsModules/BulletS/BSCharacter.cs b/OpenSim/Region/PhysicsModules/BulletS/BSCharacter.cs
index 57f03fb..04ac659 100644
--- a/OpenSim/Region/PhysicsModules/BulletS/BSCharacter.cs
+++ b/OpenSim/Region/PhysicsModules/BulletS/BSCharacter.cs
@@ -496,8 +496,8 @@ public sealed class BSCharacter : BSPhysObject
496 public override OMV.Vector3 ForceVelocity { 496 public override OMV.Vector3 ForceVelocity {
497 get { return RawVelocity; } 497 get { return RawVelocity; }
498 set { 498 set {
499 PhysScene.AssertInTaintTime("BSCharacter.ForceVelocity"); 499 PhysScene.AssertNotInSimulationTime("BSCharacter.ForceVelocity");
500 DetailLog("{0}: BSCharacter.ForceVelocity.set = {1}", LocalID, value); 500 DetailLog("{0},BSCharacter.ForceVelocity.set={1}", LocalID, value);
501 501
502 RawVelocity = Util.ClampV(value, BSParam.MaxLinearVelocity); 502 RawVelocity = Util.ClampV(value, BSParam.MaxLinearVelocity);
503 PhysScene.PE.SetLinearVelocity(PhysBody, RawVelocity); 503 PhysScene.PE.SetLinearVelocity(PhysBody, RawVelocity);
@@ -638,7 +638,7 @@ public sealed class BSCharacter : BSPhysObject
638 public override float ForceBuoyancy { 638 public override float ForceBuoyancy {
639 get { return _buoyancy; } 639 get { return _buoyancy; }
640 set { 640 set {
641 PhysScene.AssertInTaintTime("BSCharacter.ForceBuoyancy"); 641 PhysScene.AssertNotInSimulationTime("BSCharacter.ForceBuoyancy");
642 642
643 _buoyancy = value; 643 _buoyancy = value;
644 DetailLog("{0},BSCharacter.setForceBuoyancy,taint,buoy={1}", LocalID, _buoyancy); 644 DetailLog("{0},BSCharacter.setForceBuoyancy,taint,buoy={1}", LocalID, _buoyancy);