Merge branch 'master' into connector_plugin

Conflicts:
	OpenSim/Server/Base/ServicesServerBase.cs

1 files changed, 6 insertions, 0 deletions

diff --git a/OpenSim/Region/Physics/Manager/PhysicsActor.cs b/OpenSim/Region/Physics/Manager/PhysicsActor.cs
index 0587054..34413e5 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsActor.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsActor.cs
@@ -257,6 +257,12 @@ namespace OpenSim.Region.Physics.Manager
         /// Getting this returns the velocity calculated by physics scene updates, using factors such as target velocity,
         /// time to accelerate and collisions.
         /// </remarks>
+        public virtual Vector3 TargetVelocity
+        {
+            get { return Velocity; }
+            set { Velocity = value; }
+        }
+
         public abstract Vector3 Velocity { get; set; }
 
         public abstract Vector3 Torque { get; set; }