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/OdePlugin/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 '')
| -rw-r--r-- | OpenSim/Region/Physics/OdePlugin/ODECharacter.cs | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs index 9203169..05eaf2a 100644 --- a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs +++ b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs | |||
| @@ -1251,12 +1251,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
| 1251 | public override Vector3 PIDTarget { set { return; } } | 1251 | public override Vector3 PIDTarget { set { return; } } |
| 1252 | public override bool PIDActive | 1252 | public override bool PIDActive |
| 1253 | { | 1253 | { |
| 1254 | <<<<<<< HEAD | ||
| 1255 | get { return false; } | 1254 | get { return false; } |
| 1256 | ======= | ||
| 1257 | // os version | ||
| 1258 | // get { return false; } | ||
| 1259 | >>>>>>> avn/ubitvar | ||
| 1260 | set { return; } | 1255 | set { return; } |
| 1261 | } | 1256 | } |
| 1262 | public override float PIDTau { set { return; } } | 1257 | public override float PIDTau { set { return; } } |