diff options
| author | Melanie | 2013-01-23 02:38:59 +0000 |
|---|---|---|
| committer | Melanie | 2013-01-23 02:38:59 +0000 |
| commit | cc4cfd9fa81fa8e7c7254bd3c35e67ef9cb20dad (patch) | |
| tree | 0854a68c0329c37b9eedea56b3bf65458c59b696 /OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | BulletSim: Tweeks to vehicle motion. (diff) | |
| download | opensim-SC-cc4cfd9fa81fa8e7c7254bd3c35e67ef9cb20dad.zip opensim-SC-cc4cfd9fa81fa8e7c7254bd3c35e67ef9cb20dad.tar.gz opensim-SC-cc4cfd9fa81fa8e7c7254bd3c35e67ef9cb20dad.tar.bz2 opensim-SC-cc4cfd9fa81fa8e7c7254bd3c35e67ef9cb20dad.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/Physics/BulletSNPlugin/BSShapeCollection.cs
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs')
| -rwxr-xr-x | OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs index d0b2a56..89f186c 100755 --- a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs | |||
| @@ -83,7 +83,7 @@ public sealed class BSLinksetConstraints : BSLinkset | |||
| 83 | } | 83 | } |
| 84 | 84 | ||
| 85 | // Called at taint-time!! | 85 | // Called at taint-time!! |
| 86 | public override void UpdateProperties(BSPhysObject updated, bool inTaintTime) | 86 | public override void UpdateProperties(UpdatedProperties whichUpdated, BSPhysObject pObj) |
| 87 | { | 87 | { |
| 88 | // Nothing to do for constraints on property updates | 88 | // Nothing to do for constraints on property updates |
| 89 | } | 89 | } |