diff options
author | Melanie | 2012-11-01 15:52:32 +0000 |
---|---|---|
committer | Melanie | 2012-11-01 15:52:32 +0000 |
commit | e7a6328ea40bbbc5dba50ca21ec4e9e2c7283081 (patch) | |
tree | 105184438f58ba43388aa285e456dfd5ff87fdcd /OpenSim/Region/Physics/Manager | |
parent | Merge branch 'master' into careminster (diff) | |
parent | Comment out checks not to overwrite existing IAR/OAR files for now on "save i... (diff) | |
download | opensim-SC_OLD-e7a6328ea40bbbc5dba50ca21ec4e9e2c7283081.zip opensim-SC_OLD-e7a6328ea40bbbc5dba50ca21ec4e9e2c7283081.tar.gz opensim-SC_OLD-e7a6328ea40bbbc5dba50ca21ec4e9e2c7283081.tar.bz2 opensim-SC_OLD-e7a6328ea40bbbc5dba50ca21ec4e9e2c7283081.tar.xz |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/Physics/Manager')
-rw-r--r-- | OpenSim/Region/Physics/Manager/PhysicsActor.cs | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/Manager/PhysicsActor.cs b/OpenSim/Region/Physics/Manager/PhysicsActor.cs index 14f65b8..5af6373 100644 --- a/OpenSim/Region/Physics/Manager/PhysicsActor.cs +++ b/OpenSim/Region/Physics/Manager/PhysicsActor.cs | |||
@@ -340,6 +340,12 @@ namespace OpenSim.Region.Physics.Manager | |||
340 | /// Getting this returns the velocity calculated by physics scene updates, using factors such as target velocity, | 340 | /// Getting this returns the velocity calculated by physics scene updates, using factors such as target velocity, |
341 | /// time to accelerate and collisions. | 341 | /// time to accelerate and collisions. |
342 | /// </remarks> | 342 | /// </remarks> |
343 | public virtual Vector3 TargetVelocity | ||
344 | { | ||
345 | get { return Velocity; } | ||
346 | set { Velocity = value; } | ||
347 | } | ||
348 | |||
343 | public abstract Vector3 Velocity { get; set; } | 349 | public abstract Vector3 Velocity { get; set; } |
344 | 350 | ||
345 | public abstract Vector3 Torque { get; set; } | 351 | public abstract Vector3 Torque { get; set; } |