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/OdePlugin | |
| 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 '')
| -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 94e6185..75364b7 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) |