diff options
| author | Dan Lake | 2011-12-20 14:45:32 -0800 |
|---|---|---|
| committer | Dan Lake | 2011-12-20 14:45:32 -0800 |
| commit | 41b02a7208a8363f8edefb812e4f93238759d2bd (patch) | |
| tree | 3de2f42376d23ead500098d98e6d2bbd6e21feda /OpenSim/Region/Physics/OdePlugin | |
| parent | Though the viewer warns about receiving this, not sending appears to break ba... (diff) | |
| download | opensim-SC_OLD-41b02a7208a8363f8edefb812e4f93238759d2bd.zip opensim-SC_OLD-41b02a7208a8363f8edefb812e4f93238759d2bd.tar.gz opensim-SC_OLD-41b02a7208a8363f8edefb812e4f93238759d2bd.tar.bz2 opensim-SC_OLD-41b02a7208a8363f8edefb812e4f93238759d2bd.tar.xz | |
Remove unused SetAcceleration and add set on Acceleration parameter
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 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) |