From aa3303e3af2df9511b947902482409308198ce64 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Wed, 30 Sep 2015 20:13:31 +0100 Subject: [PATCH] add get method on physics actors PIDHoverActive --- .../Region/PhysicsModules/BasicPhysics/BasicPhysicsActor.cs | 1 + .../Region/PhysicsModules/BasicPhysics/BasicPhysicsPrim.cs | 1 + OpenSim/Region/PhysicsModules/BulletS/BSPhysObject.cs | 2 +- OpenSim/Region/PhysicsModules/BulletS/BSPrim.cs | 4 ++++ OpenSim/Region/PhysicsModules/Ode/ODECharacter.cs | 2 +- OpenSim/Region/PhysicsModules/Ode/ODEPrim.cs | 2 +- OpenSim/Region/PhysicsModules/POS/POSCharacter.cs | 1 + OpenSim/Region/PhysicsModules/POS/POSPrim.cs | 1 + OpenSim/Region/PhysicsModules/SharedBase/PhysicsActor.cs | 4 ++-- OpenSim/Region/PhysicsModules/ubOde/ODECharacter.cs | 4 ++++ OpenSim/Region/PhysicsModules/ubOde/ODEPrim.cs | 4 ++++ 11 files changed, 21 insertions(+), 5 deletions(-) diff --git a/OpenSim/Region/PhysicsModules/BasicPhysics/BasicPhysicsActor.cs b/OpenSim/Region/PhysicsModules/BasicPhysics/BasicPhysicsActor.cs index e7b30bac68..7ad7f6ba0a 100644 --- a/OpenSim/Region/PhysicsModules/BasicPhysics/BasicPhysicsActor.cs +++ b/OpenSim/Region/PhysicsModules/BasicPhysics/BasicPhysicsActor.cs @@ -254,6 +254,7 @@ namespace OpenSim.Region.PhysicsModule.BasicPhysics public override bool PIDHoverActive { + get { return false; } set { return; } } diff --git a/OpenSim/Region/PhysicsModules/BasicPhysics/BasicPhysicsPrim.cs b/OpenSim/Region/PhysicsModules/BasicPhysics/BasicPhysicsPrim.cs index 5383f1b090..b94f170715 100644 --- a/OpenSim/Region/PhysicsModules/BasicPhysics/BasicPhysicsPrim.cs +++ b/OpenSim/Region/PhysicsModules/BasicPhysics/BasicPhysicsPrim.cs @@ -267,6 +267,7 @@ namespace OpenSim.Region.PhysicsModule.BasicPhysics public override bool PIDHoverActive { + get { return false; } set { return; } } diff --git a/OpenSim/Region/PhysicsModules/BulletS/BSPhysObject.cs b/OpenSim/Region/PhysicsModules/BulletS/BSPhysObject.cs index da3fc18aa8..c3eb77655c 100755 --- a/OpenSim/Region/PhysicsModules/BulletS/BSPhysObject.cs +++ b/OpenSim/Region/PhysicsModules/BulletS/BSPhysObject.cs @@ -268,7 +268,7 @@ public abstract class BSPhysObject : PhysicsActor public float MoveToTargetTau { get; set; } // Used for llSetHoverHeight and maybe vehicle height. Hover Height will override MoveTo target's Z - public override bool PIDHoverActive { set { HoverActive = value; } } + public override bool PIDHoverActive {get {return HoverActive;} set { HoverActive = value; } } public override float PIDHoverHeight { set { HoverHeight = value; } } public override PIDHoverType PIDHoverType { set { HoverType = value; } } public override float PIDHoverTau { set { HoverTau = value; } } diff --git a/OpenSim/Region/PhysicsModules/BulletS/BSPrim.cs b/OpenSim/Region/PhysicsModules/BulletS/BSPrim.cs index 436ea758a9..c8ac5c5393 100644 --- a/OpenSim/Region/PhysicsModules/BulletS/BSPrim.cs +++ b/OpenSim/Region/PhysicsModules/BulletS/BSPrim.cs @@ -1173,6 +1173,10 @@ public class BSPrim : BSPhysObject // Used for llSetHoverHeight and maybe vehicle height // Hover Height will override MoveTo target's Z public override bool PIDHoverActive { + get + { + return base.HoverActive; + } set { base.HoverActive = value; EnableActor(HoverActive, HoverActorName, delegate() diff --git a/OpenSim/Region/PhysicsModules/Ode/ODECharacter.cs b/OpenSim/Region/PhysicsModules/Ode/ODECharacter.cs index b35c2998cc..8048e262a3 100644 --- a/OpenSim/Region/PhysicsModules/Ode/ODECharacter.cs +++ b/OpenSim/Region/PhysicsModules/Ode/ODECharacter.cs @@ -1257,7 +1257,7 @@ namespace OpenSim.Region.PhysicsModule.ODE public override float PIDTau { set { return; } } public override float PIDHoverHeight { set { return; } } - public override bool PIDHoverActive { set { return; } } + public override bool PIDHoverActive {get {return false;} set { return; } } public override PIDHoverType PIDHoverType { set { return; } } public override float PIDHoverTau { set { return; } } diff --git a/OpenSim/Region/PhysicsModules/Ode/ODEPrim.cs b/OpenSim/Region/PhysicsModules/Ode/ODEPrim.cs index 54a2033fcc..d22f912d17 100644 --- a/OpenSim/Region/PhysicsModules/Ode/ODEPrim.cs +++ b/OpenSim/Region/PhysicsModules/Ode/ODEPrim.cs @@ -3007,7 +3007,7 @@ Console.WriteLine(" JointCreateFixed"); public override float PIDTau { set { m_PIDTau = value; } } public override float PIDHoverHeight { set { m_PIDHoverHeight = value; ; } } - public override bool PIDHoverActive { set { m_useHoverPID = value; } } + public override bool PIDHoverActive { get { return m_useHoverPID;} set { m_useHoverPID = value; } } public override PIDHoverType PIDHoverType { set { m_PIDHoverType = value; } } public override float PIDHoverTau { set { m_PIDHoverTau = value; } } diff --git a/OpenSim/Region/PhysicsModules/POS/POSCharacter.cs b/OpenSim/Region/PhysicsModules/POS/POSCharacter.cs index 32469d9d4d..b81ecfbf09 100644 --- a/OpenSim/Region/PhysicsModules/POS/POSCharacter.cs +++ b/OpenSim/Region/PhysicsModules/POS/POSCharacter.cs @@ -291,6 +291,7 @@ namespace OpenSim.Region.PhysicsModule.POS public override bool PIDHoverActive { + get { return false; } set { return; } } diff --git a/OpenSim/Region/PhysicsModules/POS/POSPrim.cs b/OpenSim/Region/PhysicsModules/POS/POSPrim.cs index c190fab3fc..d1bbbaefc6 100644 --- a/OpenSim/Region/PhysicsModules/POS/POSPrim.cs +++ b/OpenSim/Region/PhysicsModules/POS/POSPrim.cs @@ -286,6 +286,7 @@ namespace OpenSim.Region.PhysicsModule.POS public override bool PIDHoverActive { + get { return false; } set { return; } } diff --git a/OpenSim/Region/PhysicsModules/SharedBase/PhysicsActor.cs b/OpenSim/Region/PhysicsModules/SharedBase/PhysicsActor.cs index edc41e4653..1965dc23a1 100644 --- a/OpenSim/Region/PhysicsModules/SharedBase/PhysicsActor.cs +++ b/OpenSim/Region/PhysicsModules/SharedBase/PhysicsActor.cs @@ -391,7 +391,7 @@ namespace OpenSim.Region.PhysicsModules.SharedBase // Used for llSetHoverHeight and maybe vehicle height // Hover Height will override MoveTo target's Z - public abstract bool PIDHoverActive { set;} + public abstract bool PIDHoverActive {get; set;} public abstract float PIDHoverHeight { set;} public abstract PIDHoverType PIDHoverType { set;} public abstract float PIDHoverTau { set;} @@ -621,7 +621,7 @@ namespace OpenSim.Region.PhysicsModules.SharedBase public override float PIDTau { set { return; } } public override float PIDHoverHeight { set { return; } } - public override bool PIDHoverActive { set { return; } } + public override bool PIDHoverActive {get {return false;} set { return; } } public override PIDHoverType PIDHoverType { set { return; } } public override float PIDHoverTau { set { return; } } diff --git a/OpenSim/Region/PhysicsModules/ubOde/ODECharacter.cs b/OpenSim/Region/PhysicsModules/ubOde/ODECharacter.cs index 1cebacf662..0d9f974c0e 100644 --- a/OpenSim/Region/PhysicsModules/ubOde/ODECharacter.cs +++ b/OpenSim/Region/PhysicsModules/ubOde/ODECharacter.cs @@ -1480,6 +1480,10 @@ namespace OpenSim.Region.PhysicsModule.ubOde } public override bool PIDHoverActive { + get + { + return m_useHoverPID; + } set { AddChange(changes.PIDHoverActive, value); diff --git a/OpenSim/Region/PhysicsModules/ubOde/ODEPrim.cs b/OpenSim/Region/PhysicsModules/ubOde/ODEPrim.cs index 91aca26c75..229782b437 100644 --- a/OpenSim/Region/PhysicsModules/ubOde/ODEPrim.cs +++ b/OpenSim/Region/PhysicsModules/ubOde/ODEPrim.cs @@ -747,6 +747,10 @@ namespace OpenSim.Region.PhysicsModule.ubOde } public override bool PIDHoverActive { + get + { + return m_useHoverPID; + } set { AddChange(changes.PIDHoverActive, value);