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/OdePlugin | |
| 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/OdePlugin')
| -rw-r--r-- | OpenSim/Region/Physics/OdePlugin/ODECharacter.cs | 7 | ||||
| -rw-r--r-- | OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | 1 |
2 files changed, 2 insertions, 6 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs index f2bb4bf..68999fc 100644 --- a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs +++ b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs | |||
| @@ -690,12 +690,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
| 690 | public override Vector3 Acceleration | 690 | public override Vector3 Acceleration |
| 691 | { | 691 | { |
| 692 | get { return _acceleration; } | 692 | get { return _acceleration; } |
| 693 | } | 693 | set { _acceleration = value; } |
| 694 | |||
| 695 | public void SetAcceleration(Vector3 accel) | ||
| 696 | { | ||
| 697 | m_pidControllerActive = true; | ||
| 698 | _acceleration = accel; | ||
| 699 | } | 694 | } |
| 700 | 695 | ||
| 701 | /// <summary> | 696 | /// <summary> |
diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs index af05a15..62e3763 100644 --- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs +++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | |||
| @@ -2497,6 +2497,7 @@ Console.WriteLine(" JointCreateFixed"); | |||
| 2497 | public override Vector3 Acceleration | 2497 | public override Vector3 Acceleration |
| 2498 | { | 2498 | { |
| 2499 | get { return _acceleration; } | 2499 | get { return _acceleration; } |
| 2500 | set { _acceleration = value; } | ||
| 2500 | } | 2501 | } |
| 2501 | 2502 | ||
| 2502 | public override void AddForce(Vector3 force, bool pushforce) | 2503 | public override void AddForce(Vector3 force, bool pushforce) |