diff options
author | Robert Adams | 2013-06-30 13:48:27 -0700 |
---|---|---|
committer | Robert Adams | 2013-06-30 17:07:50 -0700 |
commit | 425d2a2a972de34c1853c6049727d4c0eea38af4 (patch) | |
tree | 297d2b01cadf42e64aa4345ea2a86c588666fcbc /OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs | |
parent | BulletSim: a better version of llMoveToTarget that doesn't go crazy. (diff) | |
download | opensim-SC_OLD-425d2a2a972de34c1853c6049727d4c0eea38af4.zip opensim-SC_OLD-425d2a2a972de34c1853c6049727d4c0eea38af4.tar.gz opensim-SC_OLD-425d2a2a972de34c1853c6049727d4c0eea38af4.tar.bz2 opensim-SC_OLD-425d2a2a972de34c1853c6049727d4c0eea38af4.tar.xz |
BulletSim: set linkset type to be prim specific rather than a simulator
wide default. This allows individual prims to differ in the
underlying linkset implementation.
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) |