diff options
| author | Melanie | 2009-12-22 00:41:56 +0000 |
|---|---|---|
| committer | Melanie | 2009-12-22 00:41:56 +0000 |
| commit | fa0621b486c63a0cc6ca6aaac00f3b0a50fdbd3f (patch) | |
| tree | f644f2171b694ac6997c887ba442be9770fdce73 /OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETPrim.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Glue code for a couple of new LSL function implementations (diff) | |
| download | opensim-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/BulletDotNETPrim.cs')
| -rw-r--r-- | OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETPrim.cs | 1 |
1 files changed, 0 insertions, 1 deletions
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); |