aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/Manager
diff options
context:
space:
mode:
authorJustin Clark-Casey2014-11-19 20:06:56 +0000
committerJustin Clark-Casey2014-11-19 20:06:56 +0000
commit7a2c77e7eace93d722ef37595e9fab21d3cd266f (patch)
treed8e8a4ca5c93654526efd6761995022038977125 /OpenSim/Region/Physics/Manager
parentRemove SOP.StopMoveToTarget scheduled update which is now being done in SOG.s... (diff)
downloadopensim-SC-7a2c77e7eace93d722ef37595e9fab21d3cd266f.zip
opensim-SC-7a2c77e7eace93d722ef37595e9fab21d3cd266f.tar.gz
opensim-SC-7a2c77e7eace93d722ef37595e9fab21d3cd266f.tar.bz2
opensim-SC-7a2c77e7eace93d722ef37595e9fab21d3cd266f.tar.xz
If calling llStopMoveToTarget() on an in-world prim, don't send an unnecessary object update if the prim was not moving to target.
This involves making PhysicsActor.PIDActive get as well as set. On physics components that don't implement this (all characters and some phys engines) we return false.
Diffstat (limited to 'OpenSim/Region/Physics/Manager')
-rw-r--r--OpenSim/Region/Physics/Manager/PhysicsActor.cs10
1 files changed, 8 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/Manager/PhysicsActor.cs b/OpenSim/Region/Physics/Manager/PhysicsActor.cs
index 1750853..6bc6e23 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsActor.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsActor.cs
@@ -291,7 +291,7 @@ namespace OpenSim.Region.Physics.Manager
291 291
292 // Used for MoveTo 292 // Used for MoveTo
293 public abstract Vector3 PIDTarget { set; } 293 public abstract Vector3 PIDTarget { set; }
294 public abstract bool PIDActive { set;} 294 public abstract bool PIDActive { get; set; }
295 public abstract float PIDTau { set; } 295 public abstract float PIDTau { set; }
296 296
297 // Used for llSetHoverHeight and maybe vehicle height 297 // Used for llSetHoverHeight and maybe vehicle height
@@ -545,7 +545,13 @@ namespace OpenSim.Region.Physics.Manager
545 } 545 }
546 546
547 public override Vector3 PIDTarget { set { return; } } 547 public override Vector3 PIDTarget { set { return; } }
548 public override bool PIDActive { set { return; } } 548
549 public override bool PIDActive
550 {
551 get { return false; }
552 set { return; }
553 }
554
549 public override float PIDTau { set { return; } } 555 public override float PIDTau { set { return; } }
550 556
551 public override float PIDHoverHeight { set { return; } } 557 public override float PIDHoverHeight { set { return; } }