diff options
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs')
-rw-r--r-- | OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs index f804a0f..06e4ada 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs | |||
@@ -915,18 +915,6 @@ public sealed class BSPrim : BSPhysObject | |||
915 | get { return _throttleUpdates; } | 915 | get { return _throttleUpdates; } |
916 | set { _throttleUpdates = value; } | 916 | set { _throttleUpdates = value; } |
917 | } | 917 | } |
918 | public override bool IsColliding { | ||
919 | get { return (CollidingStep == PhysicsScene.SimulationStep); } | ||
920 | set { _isColliding = value; } | ||
921 | } | ||
922 | public override bool CollidingGround { | ||
923 | get { return (CollidingGroundStep == PhysicsScene.SimulationStep); } | ||
924 | set { _collidingGround = value; } | ||
925 | } | ||
926 | public override bool CollidingObj { | ||
927 | get { return _collidingObj; } | ||
928 | set { _collidingObj = value; } | ||
929 | } | ||
930 | public bool IsPhantom { | 918 | public bool IsPhantom { |
931 | get { | 919 | get { |
932 | // SceneObjectPart removes phantom objects from the physics scene | 920 | // SceneObjectPart removes phantom objects from the physics scene |
@@ -1006,12 +994,12 @@ public sealed class BSPrim : BSPhysObject | |||
1006 | public override OMV.Vector3 PIDTarget { | 994 | public override OMV.Vector3 PIDTarget { |
1007 | set { _PIDTarget = value; } | 995 | set { _PIDTarget = value; } |
1008 | } | 996 | } |
1009 | public override bool PIDActive { | ||
1010 | set { _usePID = value; } | ||
1011 | } | ||
1012 | public override float PIDTau { | 997 | public override float PIDTau { |
1013 | set { _PIDTau = value; } | 998 | set { _PIDTau = value; } |
1014 | } | 999 | } |
1000 | public override bool PIDActive { | ||
1001 | set { _usePID = value; } | ||
1002 | } | ||
1015 | 1003 | ||
1016 | // Used for llSetHoverHeight and maybe vehicle height | 1004 | // Used for llSetHoverHeight and maybe vehicle height |
1017 | // Hover Height will override MoveTo target's Z | 1005 | // Hover Height will override MoveTo target's Z |