diff options
| author | Dan Lake | 2011-12-20 13:40:24 -0800 |
|---|---|---|
| committer | Dan Lake | 2011-12-20 13:40:24 -0800 |
| commit | a1dc4e830dac3fa31a107aa855d2d2b2efeca0f2 (patch) | |
| tree | bd9dd4d75fde576d2ea876a9356e41fde4e84f20 /OpenSim/Region/Physics/OdePlugin | |
| parent | Just adding a comment to SendFullUpdatToClient (diff) | |
| download | opensim-SC-a1dc4e830dac3fa31a107aa855d2d2b2efeca0f2.zip opensim-SC-a1dc4e830dac3fa31a107aa855d2d2b2efeca0f2.tar.gz opensim-SC-a1dc4e830dac3fa31a107aa855d2d2b2efeca0f2.tar.bz2 opensim-SC-a1dc4e830dac3fa31a107aa855d2d2b2efeca0f2.tar.xz | |
Remove unused SetAcceleration and add set on Acceleration parameter
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 73c1c02..1363cfd 100644 --- a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs +++ b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs | |||
| @@ -689,12 +689,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
| 689 | public override Vector3 Acceleration | 689 | public override Vector3 Acceleration |
| 690 | { | 690 | { |
| 691 | get { return _acceleration; } | 691 | get { return _acceleration; } |
| 692 | } | 692 | set { _acceleration = value; } |
| 693 | |||
| 694 | public void SetAcceleration(Vector3 accel) | ||
| 695 | { | ||
| 696 | m_pidControllerActive = true; | ||
| 697 | _acceleration = accel; | ||
| 698 | } | 693 | } |
| 699 | 694 | ||
| 700 | /// <summary> | 695 | /// <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) |