aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETCharacter.cs
diff options
context:
space:
mode:
authorMelanie2009-12-22 00:41:56 +0000
committerMelanie2009-12-22 00:41:56 +0000
commitfa0621b486c63a0cc6ca6aaac00f3b0a50fdbd3f (patch)
treef644f2171b694ac6997c887ba442be9770fdce73 /OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETCharacter.cs
parentMerge branch 'master' into careminster (diff)
parentGlue code for a couple of new LSL function implementations (diff)
downloadopensim-SC-fa0621b486c63a0cc6ca6aaac00f3b0a50fdbd3f.zip
opensim-SC-fa0621b486c63a0cc6ca6aaac00f3b0a50fdbd3f.tar.gz
opensim-SC-fa0621b486c63a0cc6ca6aaac00f3b0a50fdbd3f.tar.bz2
opensim-SC-fa0621b486c63a0cc6ca6aaac00f3b0a50fdbd3f.tar.xz
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETCharacter.cs')
-rw-r--r--OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETCharacter.cs22
1 files changed, 18 insertions, 4 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