aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/Manager
diff options
context:
space:
mode:
authorDiva Canto2014-11-21 08:54:30 -0800
committerDiva Canto2014-11-21 08:54:30 -0800
commit8d3cb424a8730a0d0cdea42e513057c2c3fff679 (patch)
tree611eb8cd3c3526e1f41058ed000e1c3f9f644cf8 /OpenSim/Region/Physics/Manager
parentCleanup extraneous comments from viewer support modules (diff)
parentLSL key should be implicitly cast to a boolean value (diff)
downloadopensim-SC-8d3cb424a8730a0d0cdea42e513057c2c3fff679.zip
opensim-SC-8d3cb424a8730a0d0cdea42e513057c2c3fff679.tar.gz
opensim-SC-8d3cb424a8730a0d0cdea42e513057c2c3fff679.tar.bz2
opensim-SC-8d3cb424a8730a0d0cdea42e513057c2c3fff679.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to '')
-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; } }