diff options
| author | Kitto Flora | 2009-12-22 00:33:31 -0500 |
|---|---|---|
| committer | Kitto Flora | 2009-12-22 00:33:31 -0500 |
| commit | 93b930b9370b1439c4416c08a45fe7f23a5862c7 (patch) | |
| tree | e3546d86b64e9e2c13c4fba40a364857bfb0a8e7 /OpenSim/Region/Physics/OdePlugin | |
| parent | Include ChOdePlugin (diff) | |
| parent | Should not commit without compiling (diff) | |
| download | opensim-SC-93b930b9370b1439c4416c08a45fe7f23a5862c7.zip opensim-SC-93b930b9370b1439c4416c08a45fe7f23a5862c7.tar.gz opensim-SC-93b930b9370b1439c4416c08a45fe7f23a5862c7.tar.bz2 opensim-SC-93b930b9370b1439c4416c08a45fe7f23a5862c7.tar.xz | |
Fix conflicts
Diffstat (limited to 'OpenSim/Region/Physics/OdePlugin')
| -rw-r--r-- | OpenSim/Region/Physics/OdePlugin/ODECharacter.cs | 1 | ||||
| -rw-r--r-- | OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs index 06ed8fb..a38fccc 100644 --- a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs +++ b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs | |||
| @@ -1205,7 +1205,6 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
| 1205 | 1205 | ||
| 1206 | public override float APIDDamping{ set { return; } } | 1206 | public override float APIDDamping{ set { return; } } |
| 1207 | 1207 | ||
| 1208 | |||
| 1209 | public override void SubscribeEvents(int ms) | 1208 | public override void SubscribeEvents(int ms) |
| 1210 | { | 1209 | { |
| 1211 | m_requestedUpdateFrequency = ms; | 1210 | m_requestedUpdateFrequency = ms; |
diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs index 3eb3b28..dd7902a 100644 --- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs +++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | |||
| @@ -2822,7 +2822,7 @@ Console.WriteLine(" JointCreateFixed"); | |||
| 2822 | } | 2822 | } |
| 2823 | public override bool PIDActive { set { m_usePID = value; } } | 2823 | public override bool PIDActive { set { m_usePID = value; } } |
| 2824 | public override float PIDTau { set { m_PIDTau = value; } } | 2824 | public override float PIDTau { set { m_PIDTau = value; } } |
| 2825 | 2825 | ||
| 2826 | public override float PIDHoverHeight { set { m_PIDHoverHeight = value; ; } } | 2826 | public override float PIDHoverHeight { set { m_PIDHoverHeight = value; ; } } |
| 2827 | public override bool PIDHoverActive { set { m_useHoverPID = value; } } | 2827 | public override bool PIDHoverActive { set { m_useHoverPID = value; } } |
| 2828 | public override PIDHoverType PIDHoverType { set { m_PIDHoverType = value; } } | 2828 | public override PIDHoverType PIDHoverType { set { m_PIDHoverType = value; } } |