diff options
| author | BlueWall | 2013-01-23 08:16:18 -0500 |
|---|---|---|
| committer | BlueWall | 2013-01-23 08:16:18 -0500 |
| commit | 2841ed05cf003fef8dc820d0327c1fcce0d76e93 (patch) | |
| tree | 2d3647e4ffad8220e5b30fbdfbf7b3a36be0597c /OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs | |
| parent | Add additional return status (diff) | |
| parent | BulletSim: Tweeks to vehicle motion. (diff) | |
| download | opensim-SC_OLD-2841ed05cf003fef8dc820d0327c1fcce0d76e93.zip opensim-SC_OLD-2841ed05cf003fef8dc820d0327c1fcce0d76e93.tar.gz opensim-SC_OLD-2841ed05cf003fef8dc820d0327c1fcce0d76e93.tar.bz2 opensim-SC_OLD-2841ed05cf003fef8dc820d0327c1fcce0d76e93.tar.xz | |
Merge branch 'master' of /home/opensim/var/repo/opensim
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. |