diff options
| author | Diva Canto | 2011-12-21 15:17:44 -0800 |
|---|---|---|
| committer | Diva Canto | 2011-12-21 15:17:44 -0800 |
| commit | bb0c6a498bfbd5fe42b287e5b79b15a887b88600 (patch) | |
| tree | cc97171a5264a64dad3ece91e0f090ea4cf45d9d /OpenSim/Region/Physics/PhysXPlugin/PhysXPrim.cs | |
| parent | Moved an external test into the method that uses those preconditions. (diff) | |
| parent | Remove unused SetAcceleration and add set on Acceleration parameter (diff) | |
| download | opensim-SC-bb0c6a498bfbd5fe42b287e5b79b15a887b88600.zip opensim-SC-bb0c6a498bfbd5fe42b287e5b79b15a887b88600.tar.gz opensim-SC-bb0c6a498bfbd5fe42b287e5b79b15a887b88600.tar.bz2 opensim-SC-bb0c6a498bfbd5fe42b287e5b79b15a887b88600.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Physics/PhysXPlugin/PhysXPrim.cs')
| -rw-r--r-- | OpenSim/Region/Physics/PhysXPlugin/PhysXPrim.cs | 6 |
1 files changed, 1 insertions, 5 deletions
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 | |||
| 207 | public override Vector3 Acceleration | 207 | public override Vector3 Acceleration |
| 208 | { | 208 | { |
| 209 | get { return _acceleration; } | 209 | get { return _acceleration; } |
| 210 | } | 210 | set { _acceleration = value; } |
| 211 | |||
| 212 | public void SetAcceleration(Vector3 accel) | ||
| 213 | { | ||
| 214 | _acceleration = accel; | ||
| 215 | } | 211 | } |
| 216 | 212 | ||
| 217 | public override void AddForce(Vector3 force, bool pushforce) | 213 | public override void AddForce(Vector3 force, bool pushforce) |