diff options
| author | UbitUmarov | 2015-09-02 19:54:53 +0100 |
|---|---|---|
| committer | UbitUmarov | 2015-09-02 19:54:53 +0100 |
| commit | a11edceb00b5b86f825bd957bdac9edb91f893dd (patch) | |
| tree | c192eae26f3aadf365a66f32fc6d9ade2f0a0c61 /OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs | |
| parent | bad merge? (diff) | |
| download | opensim-SC-a11edceb00b5b86f825bd957bdac9edb91f893dd.zip opensim-SC-a11edceb00b5b86f825bd957bdac9edb91f893dd.tar.gz opensim-SC-a11edceb00b5b86f825bd957bdac9edb91f893dd.tar.bz2 opensim-SC-a11edceb00b5b86f825bd957bdac9edb91f893dd.tar.xz | |
seems to compile ( tests comented out)
Diffstat (limited to 'OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs')
| -rw-r--r-- | OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs index 1c38246..0e2cbd2 100644 --- a/OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs +++ b/OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs | |||
| @@ -1415,7 +1415,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
| 1415 | } | 1415 | } |
| 1416 | 1416 | ||
| 1417 | public override Vector3 PIDTarget { set { return; } } | 1417 | public override Vector3 PIDTarget { set { return; } } |
| 1418 | public override bool PIDActive { set { return; } } | 1418 | public override bool PIDActive {get {return m_pidControllerActive;} set { return; } } |
| 1419 | public override float PIDTau { set { return; } } | 1419 | public override float PIDTau { set { return; } } |
| 1420 | 1420 | ||
| 1421 | public override float PIDHoverHeight { set { return; } } | 1421 | public override float PIDHoverHeight { set { return; } } |