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/ChOdePlugin | |
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/ChOdePlugin')
-rw-r--r-- | OpenSim/Region/Physics/ChOdePlugin/ODECharacter.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Physics/ChOdePlugin/OdePlugin.cs | 5 |
3 files changed, 7 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/ChOdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/ChOdePlugin/ODECharacter.cs index ec717d7..e7a39eb 100644 --- a/OpenSim/Region/Physics/ChOdePlugin/ODECharacter.cs +++ b/OpenSim/Region/Physics/ChOdePlugin/ODECharacter.cs | |||
@@ -1288,7 +1288,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
1288 | } | 1288 | } |
1289 | 1289 | ||
1290 | public override Vector3 PIDTarget { set { return; } } | 1290 | public override Vector3 PIDTarget { set { return; } } |
1291 | public override bool PIDActive { set { return; } } | 1291 | public override bool PIDActive { get { return m_pidControllerActive; } set { return; } } |
1292 | public override float PIDTau { set { return; } } | 1292 | public override float PIDTau { set { return; } } |
1293 | 1293 | ||
1294 | public override float PIDHoverHeight { set { return; } } | 1294 | public override float PIDHoverHeight { set { return; } } |
diff --git a/OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs index ba24aa7..b283152 100644 --- a/OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs +++ b/OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs | |||
@@ -748,7 +748,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
748 | m_log.Warn("[PHYSICS]: Got NaN PIDTarget from Scene on Object"); | 748 | m_log.Warn("[PHYSICS]: Got NaN PIDTarget from Scene on Object"); |
749 | } | 749 | } |
750 | } | 750 | } |
751 | public override bool PIDActive { set { m_usePID = value; } } | 751 | public override bool PIDActive { get { return m_usePID; } set { m_usePID = value; } } |
752 | public override float PIDTau { set { m_PIDTau = value; } } | 752 | public override float PIDTau { set { m_PIDTau = value; } } |
753 | 753 | ||
754 | // For RotLookAt | 754 | // For RotLookAt |
diff --git a/OpenSim/Region/Physics/ChOdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/ChOdePlugin/OdePlugin.cs index 00f5122..00baa21 100644 --- a/OpenSim/Region/Physics/ChOdePlugin/OdePlugin.cs +++ b/OpenSim/Region/Physics/ChOdePlugin/OdePlugin.cs | |||
@@ -1667,6 +1667,11 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
1667 | 1667 | ||
1668 | #region Add/Remove Entities | 1668 | #region Add/Remove Entities |
1669 | 1669 | ||
1670 | public override PhysicsActor AddAvatar(string avName, Vector3 position, Vector3 velocity, Vector3 size, bool isFlying) | ||
1671 | { | ||
1672 | return AddAvatar(avName, position, size, isFlying); | ||
1673 | } | ||
1674 | |||
1670 | public override PhysicsActor AddAvatar(string avName, Vector3 position, Vector3 size, bool isFlying) | 1675 | public override PhysicsActor AddAvatar(string avName, Vector3 position, Vector3 size, bool isFlying) |
1671 | { | 1676 | { |
1672 | Vector3 pos; | 1677 | Vector3 pos; |