aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
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/BulletSPlugin/BSPhysObject.cs
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 'OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs')
-rwxr-xr-xOpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs7
1 files changed, 6 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
index 75ffeb4..f059322 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
@@ -246,7 +246,12 @@ public abstract class BSPhysObject : PhysicsActor
246 246
247 public virtual bool ForceBodyShapeRebuild(bool inTaintTime) { return false; } 247 public virtual bool ForceBodyShapeRebuild(bool inTaintTime) { return false; }
248 248
249 public override bool PIDActive { set { MoveToTargetActive = value; } } 249 public override bool PIDActive
250 {
251 get { return MoveToTargetActive; }
252 set { MoveToTargetActive = value; }
253 }
254
250 public override OMV.Vector3 PIDTarget { set { MoveToTargetTarget = value; } } 255 public override OMV.Vector3 PIDTarget { set { MoveToTargetTarget = value; } }
251 public override float PIDTau { set { MoveToTargetTau = value; } } 256 public override float PIDTau { set { MoveToTargetTau = value; } }
252 257