diff options
| author | UbitUmarov | 2015-09-01 14:54:35 +0100 |
|---|---|---|
| committer | UbitUmarov | 2015-09-01 14:54:35 +0100 |
| commit | 371c9dd2af01a2e7422ec901ee1f80757284a78c (patch) | |
| tree | 058d2a513cacb12efcce0c0df0ae14ad135dbfe2 /OpenSim/Region/Physics/OdePlugin/ODECharacter.cs | |
| parent | remove lixo (diff) | |
| parent | dont change camera on crossings (diff) | |
| download | opensim-SC_OLD-371c9dd2af01a2e7422ec901ee1f80757284a78c.zip opensim-SC_OLD-371c9dd2af01a2e7422ec901ee1f80757284a78c.tar.gz opensim-SC_OLD-371c9dd2af01a2e7422ec901ee1f80757284a78c.tar.bz2 opensim-SC_OLD-371c9dd2af01a2e7422ec901ee1f80757284a78c.tar.xz | |
bad merge?
Diffstat (limited to 'OpenSim/Region/Physics/OdePlugin/ODECharacter.cs')
| -rw-r--r-- | OpenSim/Region/Physics/OdePlugin/ODECharacter.cs | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs index 05eaf2a..9203169 100644 --- a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs +++ b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs | |||
| @@ -1251,7 +1251,12 @@ 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 | ||
| 1254 | get { return false; } | 1255 | get { return false; } |
| 1256 | ======= | ||
| 1257 | // os version | ||
| 1258 | // get { return false; } | ||
| 1259 | >>>>>>> avn/ubitvar | ||
| 1255 | set { return; } | 1260 | set { return; } |
| 1256 | } | 1261 | } |
| 1257 | public override float PIDTau { set { return; } } | 1262 | public override float PIDTau { set { return; } } |