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/BSLinkset.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | BulletSim: Tweeks to vehicle motion. (diff) | |
| download | opensim-SC_OLD-cc4cfd9fa81fa8e7c7254bd3c35e67ef9cb20dad.zip opensim-SC_OLD-cc4cfd9fa81fa8e7c7254bd3c35e67ef9cb20dad.tar.gz opensim-SC_OLD-cc4cfd9fa81fa8e7c7254bd3c35e67ef9cb20dad.tar.bz2 opensim-SC_OLD-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/BSLinkset.cs')
| -rwxr-xr-x | OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs b/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs index cbd160f..580ea4e 100755 --- a/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs | |||
| @@ -252,7 +252,7 @@ public abstract class BSLinkset | |||
| 252 | // of the linkset is received. | 252 | // of the linkset is received. |
| 253 | // Passed flag is update came from physics engine (true) or the user (false). | 253 | // Passed flag is update came from physics engine (true) or the user (false). |
| 254 | // Called at taint-time!! | 254 | // Called at taint-time!! |
| 255 | public abstract void UpdateProperties(BSPhysObject physObject, bool physicalUpdate); | 255 | public abstract void UpdateProperties(UpdatedProperties whichUpdated, BSPhysObject physObject); |
| 256 | 256 | ||
| 257 | // Routine used when rebuilding the body of the root of the linkset | 257 | // Routine used when rebuilding the body of the root of the linkset |
| 258 | // Destroy all the constraints have have been made to root. | 258 | // Destroy all the constraints have have been made to root. |