diff options
author | UbitUmarov | 2015-09-30 20:13:31 +0100 |
---|---|---|
committer | UbitUmarov | 2015-09-30 20:13:31 +0100 |
commit | aa3303e3af2df9511b947902482409308198ce64 (patch) | |
tree | 35ea683b9a918a09763b87aa2916d58a2ba9f199 /OpenSim/Region/PhysicsModules/BulletS | |
parent | first steps adding suport for llSetHoverHeight() called from attachments on ... (diff) | |
download | opensim-SC_OLD-aa3303e3af2df9511b947902482409308198ce64.zip opensim-SC_OLD-aa3303e3af2df9511b947902482409308198ce64.tar.gz opensim-SC_OLD-aa3303e3af2df9511b947902482409308198ce64.tar.bz2 opensim-SC_OLD-aa3303e3af2df9511b947902482409308198ce64.tar.xz |
add get method on physics actors PIDHoverActive
Diffstat (limited to 'OpenSim/Region/PhysicsModules/BulletS')
-rwxr-xr-x | OpenSim/Region/PhysicsModules/BulletS/BSPhysObject.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/PhysicsModules/BulletS/BSPrim.cs | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/OpenSim/Region/PhysicsModules/BulletS/BSPhysObject.cs b/OpenSim/Region/PhysicsModules/BulletS/BSPhysObject.cs index da3fc18..c3eb776 100755 --- a/OpenSim/Region/PhysicsModules/BulletS/BSPhysObject.cs +++ b/OpenSim/Region/PhysicsModules/BulletS/BSPhysObject.cs | |||
@@ -268,7 +268,7 @@ public abstract class BSPhysObject : PhysicsActor | |||
268 | public float MoveToTargetTau { get; set; } | 268 | public float MoveToTargetTau { get; set; } |
269 | 269 | ||
270 | // Used for llSetHoverHeight and maybe vehicle height. Hover Height will override MoveTo target's Z | 270 | // Used for llSetHoverHeight and maybe vehicle height. Hover Height will override MoveTo target's Z |
271 | public override bool PIDHoverActive { set { HoverActive = value; } } | 271 | public override bool PIDHoverActive {get {return HoverActive;} set { HoverActive = value; } } |
272 | public override float PIDHoverHeight { set { HoverHeight = value; } } | 272 | public override float PIDHoverHeight { set { HoverHeight = value; } } |
273 | public override PIDHoverType PIDHoverType { set { HoverType = value; } } | 273 | public override PIDHoverType PIDHoverType { set { HoverType = value; } } |
274 | public override float PIDHoverTau { set { HoverTau = value; } } | 274 | public override float PIDHoverTau { set { HoverTau = value; } } |
diff --git a/OpenSim/Region/PhysicsModules/BulletS/BSPrim.cs b/OpenSim/Region/PhysicsModules/BulletS/BSPrim.cs index 436ea75..c8ac5c5 100644 --- a/OpenSim/Region/PhysicsModules/BulletS/BSPrim.cs +++ b/OpenSim/Region/PhysicsModules/BulletS/BSPrim.cs | |||
@@ -1173,6 +1173,10 @@ public class BSPrim : BSPhysObject | |||
1173 | // Used for llSetHoverHeight and maybe vehicle height | 1173 | // Used for llSetHoverHeight and maybe vehicle height |
1174 | // Hover Height will override MoveTo target's Z | 1174 | // Hover Height will override MoveTo target's Z |
1175 | public override bool PIDHoverActive { | 1175 | public override bool PIDHoverActive { |
1176 | get | ||
1177 | { | ||
1178 | return base.HoverActive; | ||
1179 | } | ||
1176 | set { | 1180 | set { |
1177 | base.HoverActive = value; | 1181 | base.HoverActive = value; |
1178 | EnableActor(HoverActive, HoverActorName, delegate() | 1182 | EnableActor(HoverActive, HoverActorName, delegate() |