diff options
Diffstat (limited to 'OpenSim/Region/Physics/UbitOdePlugin')
-rw-r--r-- | OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs | 5 |
3 files changed, 10 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; } } |
diff --git a/OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs index b13f601..8bcdd89 100644 --- a/OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs +++ b/OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs | |||
@@ -716,6 +716,10 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
716 | 716 | ||
717 | public override bool PIDActive | 717 | public override bool PIDActive |
718 | { | 718 | { |
719 | get | ||
720 | { | ||
721 | return m_usePID; | ||
722 | } | ||
719 | set | 723 | set |
720 | { | 724 | { |
721 | AddChange(changes.PIDActive,value); | 725 | AddChange(changes.PIDActive,value); |
diff --git a/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs b/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs index dafd3a3..26e8e54 100644 --- a/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs +++ b/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs | |||
@@ -1222,6 +1222,11 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
1222 | 1222 | ||
1223 | #region Add/Remove Entities | 1223 | #region Add/Remove Entities |
1224 | 1224 | ||
1225 | public override PhysicsActor AddAvatar(string avName, Vector3 position, Vector3 velocity, Vector3 size, bool isFlying) | ||
1226 | { | ||
1227 | return AddAvatar(avName, position, size, isFlying); | ||
1228 | } | ||
1229 | |||
1225 | public override PhysicsActor AddAvatar(uint localID, string avName, Vector3 position, Vector3 size, float feetOffset, bool isFlying) | 1230 | public override PhysicsActor AddAvatar(uint localID, string avName, Vector3 position, Vector3 size, float feetOffset, bool isFlying) |
1226 | { | 1231 | { |
1227 | Vector3 pos; | 1232 | Vector3 pos; |