diff options
author | Melanie | 2013-07-04 22:32:58 +0100 |
---|---|---|
committer | Melanie | 2013-07-04 22:32:58 +0100 |
commit | 5ddcc25ee9de481c40a26aabc57d77c71225162e (patch) | |
tree | 298768abaca492365ac1c9786b0d4ce7dae934ab /OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs | |
parent | Merge branch 'master' into careminster (diff) | |
parent | Guard against completely unknown user UUIDs. (diff) | |
download | opensim-SC_OLD-5ddcc25ee9de481c40a26aabc57d77c71225162e.zip opensim-SC_OLD-5ddcc25ee9de481c40a26aabc57d77c71225162e.tar.gz opensim-SC_OLD-5ddcc25ee9de481c40a26aabc57d77c71225162e.tar.bz2 opensim-SC_OLD-5ddcc25ee9de481c40a26aabc57d77c71225162e.tar.xz |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs')
-rwxr-xr-x | OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs index 350a5d1..308cf13 100755 --- a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs | |||
@@ -238,7 +238,6 @@ public sealed class BSLinksetCompound : BSLinkset | |||
238 | // there will already be a rebuild scheduled. | 238 | // there will already be a rebuild scheduled. |
239 | DetailLog("{0},BSLinksetCompound.UpdateProperties,couldNotUpdateChild.schedulingRebuild,whichUpdated={1}", | 239 | DetailLog("{0},BSLinksetCompound.UpdateProperties,couldNotUpdateChild.schedulingRebuild,whichUpdated={1}", |
240 | updated.LocalID, whichUpdated); | 240 | updated.LocalID, whichUpdated); |
241 | updated.LinksetInfo = null; // setting to 'null' causes relative position to be recomputed. | ||
242 | ScheduleRebuild(updated); | 241 | ScheduleRebuild(updated); |
243 | } | 242 | } |
244 | } | 243 | } |
@@ -294,7 +293,6 @@ public sealed class BSLinksetCompound : BSLinkset | |||
294 | child.LocalID, child.PhysBody.AddrString); | 293 | child.LocalID, child.PhysBody.AddrString); |
295 | 294 | ||
296 | // Cause the child's body to be rebuilt and thus restored to normal operation | 295 | // Cause the child's body to be rebuilt and thus restored to normal operation |
297 | child.LinksetInfo = null; | ||
298 | child.ForceBodyShapeRebuild(false); | 296 | child.ForceBodyShapeRebuild(false); |
299 | 297 | ||
300 | if (!HasAnyChildren) | 298 | if (!HasAnyChildren) |