diff options
author | Justin Clark-Casey (justincc) | 2012-11-01 03:34:11 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-11-01 03:34:11 +0000 |
commit | a7d9f5598fc3b5bfc4b1c7a218f3a98c95f69579 (patch) | |
tree | 75dfe9d38d8926e96d877945fdd84377a2cb2de8 /OpenSim/Region/Physics/Manager | |
parent | Replace the 64 bit macosx version of libopenjpeg-dotnet.dylib with a 32-bit v... (diff) | |
parent | Add TargetVelocity to PhysicsActor interface to support distributed physics. ... (diff) | |
download | opensim-SC_OLD-a7d9f5598fc3b5bfc4b1c7a218f3a98c95f69579.zip opensim-SC_OLD-a7d9f5598fc3b5bfc4b1c7a218f3a98c95f69579.tar.gz opensim-SC_OLD-a7d9f5598fc3b5bfc4b1c7a218f3a98c95f69579.tar.bz2 opensim-SC_OLD-a7d9f5598fc3b5bfc4b1c7a218f3a98c95f69579.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to '')
-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 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 | |||
257 | /// Getting this returns the velocity calculated by physics scene updates, using factors such as target velocity, | 257 | /// Getting this returns the velocity calculated by physics scene updates, using factors such as target velocity, |
258 | /// time to accelerate and collisions. | 258 | /// time to accelerate and collisions. |
259 | /// </remarks> | 259 | /// </remarks> |
260 | public virtual Vector3 TargetVelocity | ||
261 | { | ||
262 | get { return Velocity; } | ||
263 | set { Velocity = value; } | ||
264 | } | ||
265 | |||
260 | public abstract Vector3 Velocity { get; set; } | 266 | public abstract Vector3 Velocity { get; set; } |
261 | 267 | ||
262 | public abstract Vector3 Torque { get; set; } | 268 | public abstract Vector3 Torque { get; set; } |