diff options
Diffstat (limited to 'OpenSim/Region/Physics')
6 files changed, 20 insertions, 8 deletions
diff --git a/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETCharacter.cs b/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETCharacter.cs index 98681d6..88f5d3e 100644 --- a/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETCharacter.cs +++ b/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETCharacter.cs | |||
@@ -620,11 +620,25 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin | |||
620 | set { return; } | 620 | set { return; } |
621 | } | 621 | } |
622 | 622 | ||
623 | public override Quaternion APIDTarget { set { return; } } | 623 | public override Quaternion APIDTarget |
624 | public override bool APIDActive { set { return; } } | 624 | { |
625 | public override float APIDStrength { set { return; } } | 625 | set { return; } |
626 | public override float APIDDamping { set { return; } } | 626 | } |
627 | |||
628 | public override bool APIDActive | ||
629 | { | ||
630 | set { return; } | ||
631 | } | ||
627 | 632 | ||
633 | public override float APIDStrength | ||
634 | { | ||
635 | set { return; } | ||
636 | } | ||
637 | |||
638 | public override float APIDDamping | ||
639 | { | ||
640 | set { return; } | ||
641 | } | ||
628 | 642 | ||
629 | /// <summary> | 643 | /// <summary> |
630 | /// Adds the force supplied to the Target Velocity | 644 | /// Adds the force supplied to the Target Velocity |
diff --git a/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETPrim.cs b/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETPrim.cs index d931f126..9603ea4 100644 --- a/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETPrim.cs +++ b/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETPrim.cs | |||
@@ -570,7 +570,6 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin | |||
570 | public override float APIDStrength { set { return; } } | 570 | public override float APIDStrength { set { return; } } |
571 | public override float APIDDamping { set { return; } } | 571 | public override float APIDDamping { set { return; } } |
572 | 572 | ||
573 | |||
574 | public override void AddForce(Vector3 force, bool pushforce) | 573 | public override void AddForce(Vector3 force, bool pushforce) |
575 | { | 574 | { |
576 | m_forcelist.Add(force); | 575 | m_forcelist.Add(force); |
diff --git a/OpenSim/Region/Physics/Manager/PhysicsActor.cs b/OpenSim/Region/Physics/Manager/PhysicsActor.cs index b82586f..10b153d 100644 --- a/OpenSim/Region/Physics/Manager/PhysicsActor.cs +++ b/OpenSim/Region/Physics/Manager/PhysicsActor.cs | |||
@@ -487,7 +487,6 @@ namespace OpenSim.Region.Physics.Manager | |||
487 | public override float APIDStrength { set { return; } } | 487 | public override float APIDStrength { set { return; } } |
488 | public override float APIDDamping { set { return; } } | 488 | public override float APIDDamping { set { return; } } |
489 | 489 | ||
490 | |||
491 | public override void SetMomentum(Vector3 momentum) | 490 | public override void SetMomentum(Vector3 momentum) |
492 | { | 491 | { |
493 | } | 492 | } |
diff --git a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs index 06ed8fb..a38fccc 100644 --- a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs +++ b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs | |||
@@ -1205,7 +1205,6 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
1205 | 1205 | ||
1206 | public override float APIDDamping{ set { return; } } | 1206 | public override float APIDDamping{ set { return; } } |
1207 | 1207 | ||
1208 | |||
1209 | public override void SubscribeEvents(int ms) | 1208 | public override void SubscribeEvents(int ms) |
1210 | { | 1209 | { |
1211 | m_requestedUpdateFrequency = ms; | 1210 | m_requestedUpdateFrequency = ms; |
diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs index 3eb3b28..dd7902a 100644 --- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs +++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | |||
@@ -2822,7 +2822,7 @@ Console.WriteLine(" JointCreateFixed"); | |||
2822 | } | 2822 | } |
2823 | public override bool PIDActive { set { m_usePID = value; } } | 2823 | public override bool PIDActive { set { m_usePID = value; } } |
2824 | public override float PIDTau { set { m_PIDTau = value; } } | 2824 | public override float PIDTau { set { m_PIDTau = value; } } |
2825 | 2825 | ||
2826 | public override float PIDHoverHeight { set { m_PIDHoverHeight = value; ; } } | 2826 | public override float PIDHoverHeight { set { m_PIDHoverHeight = value; ; } } |
2827 | public override bool PIDHoverActive { set { m_useHoverPID = value; } } | 2827 | public override bool PIDHoverActive { set { m_useHoverPID = value; } } |
2828 | public override PIDHoverType PIDHoverType { set { m_PIDHoverType = value; } } | 2828 | public override PIDHoverType PIDHoverType { set { m_PIDHoverType = value; } } |
diff --git a/OpenSim/Region/Physics/POSPlugin/POSPrim.cs b/OpenSim/Region/Physics/POSPlugin/POSPrim.cs index 847b634..edccf47 100644 --- a/OpenSim/Region/Physics/POSPlugin/POSPrim.cs +++ b/OpenSim/Region/Physics/POSPlugin/POSPrim.cs | |||
@@ -299,6 +299,7 @@ namespace OpenSim.Region.Physics.POSPlugin | |||
299 | { | 299 | { |
300 | set { return; } | 300 | set { return; } |
301 | } | 301 | } |
302 | |||
302 | public override Quaternion APIDTarget | 303 | public override Quaternion APIDTarget |
303 | { | 304 | { |
304 | set { return; } | 305 | set { return; } |