Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

3 files changed, 20 insertions, 7 deletions

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
index 9b56fb4..a303972 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
@@ -614,9 +614,9 @@ public sealed class BSCharacter : BSPhysObject
     public override OMV.Vector3 PIDTarget {
         set { _PIDTarget = value; }
     }
-    public override bool PIDActive {
-        set { _usePID = value; }
-    }
+
+    public override bool PIDActive { get; set; }
+
     public override float PIDTau {
         set { _PIDTau = value; }
     }
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
 
     public virtual bool ForceBodyShapeRebuild(bool inTaintTime) { return false; }
 
-    public override bool PIDActive { set { MoveToTargetActive = value; } }
+    public override bool PIDActive 
+    {
+        get { return MoveToTargetActive; }
+        set { MoveToTargetActive = value; } 
+    }
+
     public override OMV.Vector3 PIDTarget { set { MoveToTargetTarget = value; } }
     public override float PIDTau { set { MoveToTargetTau = value; } }
 
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
index edec949..27ee5ac 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
@@ -1087,9 +1087,17 @@ public class BSPrim : BSPhysObject
         }
     }
 
-    public override bool PIDActive {
-        set {
-            base.MoveToTargetActive = value;
+    public override bool PIDActive 
+    {
+        get
+        {
+            return MoveToTargetActive;
+        }
+
+        set 
+        {
+            MoveToTargetActive = value;
+
             EnableActor(MoveToTargetActive, MoveToTargetActorName, delegate()
             {
                 return new BSActorMoveToTarget(PhysScene, this, MoveToTargetActorName);