diff options
| author | Melanie | 2011-12-22 16:37:25 +0000 |
|---|---|---|
| committer | Melanie | 2011-12-22 16:37:25 +0000 |
| commit | b970d4f976ec7f264c33948c734a15a2dbf0ac7d (patch) | |
| tree | 93a3365e4a8a32bdfce1ef92bafc02f79f98d449 /OpenSim/Region/Physics/PhysXPlugin | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Fixing a bug introduced yesterday. This put the precondition test inside Chec... (diff) | |
| download | opensim-SC_OLD-b970d4f976ec7f264c33948c734a15a2dbf0ac7d.zip opensim-SC_OLD-b970d4f976ec7f264c33948c734a15a2dbf0ac7d.tar.gz opensim-SC_OLD-b970d4f976ec7f264c33948c734a15a2dbf0ac7d.tar.bz2 opensim-SC_OLD-b970d4f976ec7f264c33948c734a15a2dbf0ac7d.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
Diffstat (limited to 'OpenSim/Region/Physics/PhysXPlugin')
| -rw-r--r-- | OpenSim/Region/Physics/PhysXPlugin/PhysXCharacter.cs | 6 | ||||
| -rw-r--r-- | OpenSim/Region/Physics/PhysXPlugin/PhysXPrim.cs | 6 |
2 files changed, 2 insertions, 10 deletions
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 | |||
| 233 | public override Vector3 Acceleration | 233 | public override Vector3 Acceleration |
| 234 | { | 234 | { |
| 235 | get { return _acceleration; } | 235 | get { return _acceleration; } |
| 236 | } | 236 | set { _acceleration = value; } |
| 237 | |||
| 238 | public void SetAcceleration(Vector3 accel) | ||
| 239 | { | ||
| 240 | _acceleration = accel; | ||
| 241 | } | 237 | } |
| 242 | 238 | ||
| 243 | public override void AddForce(Vector3 force, bool pushforce) | 239 | 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 | |||
| 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) |