Remove unused SetAcceleration and add set on Acceleration parameter

11 files changed, 14 insertions, 35 deletions

diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index 55ba18a..9f9b4f0 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -46,7 +46,7 @@ using OpenSim.Region.Framework;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Region.Physics.Manager;
-using OpenSim.Server.Base;

+using OpenSim.Server.Base;
 using OpenSim.Services.Base;
 using OpenSim.Services.Interfaces;
 using OpenSim.Services.UserAccountService;
diff --git a/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsActor.cs b/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsActor.cs
index 5e2eeeb..9964edc 100644
--- a/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsActor.cs
+++ b/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsActor.cs
@@ -232,6 +232,7 @@ namespace OpenSim.Region.Physics.BasicPhysicsPlugin
         public override Vector3 Acceleration
         {
             get { return _acceleration; }
+            set { _acceleration = value; }
         }
 
         public override bool Kinematic
@@ -252,11 +253,6 @@ namespace OpenSim.Region.Physics.BasicPhysicsPlugin
         {
         }
 
-        public void SetAcceleration(Vector3 accel)
-        {
-            _acceleration = accel;
-        }
-
         public override void AddForce(Vector3 force, bool pushforce)
         {
         }
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
index 9a6857b..0cab5d1 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
@@ -231,7 +231,8 @@ public class BSCharacter : PhysicsActor
         } 
     }
     public override Vector3 Acceleration { 
-        get { return _acceleration; } 
+        get { return _acceleration; }
+        set { _acceleration = value; }
     }
     public override Quaternion Orientation { 
         get { return _orientation; } 
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
index 8782e62..898436b 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
@@ -417,7 +417,8 @@ public sealed class BSPrim : PhysicsActor
         } 
     }
     public override OMV.Vector3 Acceleration { 
-        get { return _acceleration; } 
+        get { return _acceleration; }
+        set { _acceleration = value; }
     }
     public override OMV.Quaternion Orientation { 
         get { return _orientation; } 
diff --git a/OpenSim/Region/Physics/Manager/PhysicsActor.cs b/OpenSim/Region/Physics/Manager/PhysicsActor.cs
index c2acf97..0587054 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsActor.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsActor.cs
@@ -261,7 +261,7 @@ namespace OpenSim.Region.Physics.Manager
 
         public abstract Vector3 Torque { get; set; }
         public abstract float CollisionScore { get; set;}
-        public abstract Vector3 Acceleration { get; }
+        public abstract Vector3 Acceleration { get; set; }
         public abstract Quaternion Orientation { get; set; }
         public abstract int PhysicsActorType { get; set; }
         public abstract bool IsPhysical { get; set; }
@@ -458,6 +458,7 @@ namespace OpenSim.Region.Physics.Manager
         public override Vector3 Acceleration
         {
             get { return Vector3.Zero; }
+            set { }
         }
 
         public override bool IsPhysical
diff --git a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
index 73c1c02..1363cfd 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
@@ -689,12 +689,7 @@ namespace OpenSim.Region.Physics.OdePlugin
         public override Vector3 Acceleration
         {
             get { return _acceleration; }
-        }
-
-        public void SetAcceleration(Vector3 accel)
-        {
-            m_pidControllerActive = true;
-            _acceleration = accel;
+            set { _acceleration = value; }
         }
 
         /// <summary>
diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
index 94e6185..75364b7 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
@@ -2497,6 +2497,7 @@ Console.WriteLine(" JointCreateFixed");
         public override Vector3 Acceleration
         {
             get { return _acceleration; }
+            set { _acceleration = value; }
         }
 
         public override void AddForce(Vector3 force, bool pushforce)
diff --git a/OpenSim/Region/Physics/POSPlugin/POSCharacter.cs b/OpenSim/Region/Physics/POSPlugin/POSCharacter.cs
index a70179b..ae534ea 100644
--- a/OpenSim/Region/Physics/POSPlugin/POSCharacter.cs
+++ b/OpenSim/Region/Physics/POSPlugin/POSCharacter.cs
@@ -231,6 +231,7 @@ namespace OpenSim.Region.Physics.POSPlugin
         public override Vector3 Acceleration
         {
             get { return _acceleration; }
+            set { _acceleration = value; }
         }
 
         public override bool Kinematic
@@ -251,11 +252,6 @@ namespace OpenSim.Region.Physics.POSPlugin
         {
         }
 
-        public void SetAcceleration(Vector3 accel)
-        {
-            _acceleration = accel;
-        }
-
         public override void AddForce(Vector3 force, bool pushforce)
         {
         }
diff --git a/OpenSim/Region/Physics/POSPlugin/POSPrim.cs b/OpenSim/Region/Physics/POSPlugin/POSPrim.cs
index 91ec3df..e4fd7eb 100644
--- a/OpenSim/Region/Physics/POSPlugin/POSPrim.cs
+++ b/OpenSim/Region/Physics/POSPlugin/POSPrim.cs
@@ -193,6 +193,7 @@ namespace OpenSim.Region.Physics.POSPlugin
         public override Vector3 Acceleration
         {
             get { return _acceleration; }
+            set { _acceleration = value; }
         }
 
         public override bool Kinematic
@@ -201,11 +202,6 @@ namespace OpenSim.Region.Physics.POSPlugin
             set { }
         }
 
-        public void SetAcceleration(Vector3 accel)
-        {
-            _acceleration = accel;
-        }
-
         public override void AddForce(Vector3 force, bool pushforce)
         {
         }
diff --git a/OpenSim/Region/Physics/PhysXPlugin/PhysXCharacter.cs b/OpenSim/Region/Physics/PhysXPlugin/PhysXCharacter.cs
index 92261cd..9216a9e 100644
--- a/OpenSim/Region/Physics/PhysXPlugin/PhysXCharacter.cs
+++ b/OpenSim/Region/Physics/PhysXPlugin/PhysXCharacter.cs
@@ -233,11 +233,7 @@ namespace OpenSim.Region.Physics.PhysXPlugin
         public override Vector3 Acceleration
         {
             get { return _acceleration; }
-        }
-
-        public void SetAcceleration(Vector3 accel)
-        {
-            _acceleration = accel;
+            set { _acceleration = value; }
         }
 
         public override void AddForce(Vector3 force, bool pushforce)
diff --git a/OpenSim/Region/Physics/PhysXPlugin/PhysXPrim.cs b/OpenSim/Region/Physics/PhysXPlugin/PhysXPrim.cs
index c0e24fd..42bd119 100644
--- a/OpenSim/Region/Physics/PhysXPlugin/PhysXPrim.cs
+++ b/OpenSim/Region/Physics/PhysXPlugin/PhysXPrim.cs
@@ -207,11 +207,7 @@ namespace OpenSim.Region.Physics.PhysXPlugin
         public override Vector3 Acceleration
         {
             get { return _acceleration; }
-        }
-
-        public void SetAcceleration(Vector3 accel)
-        {
-            _acceleration = accel;
+            set { _acceleration = value; }
         }
 
         public override void AddForce(Vector3 force, bool pushforce)