aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs
diff options
context:
space:
mode:
authorRobert Adams2015-08-06 19:57:32 -0700
committerRobert Adams2015-08-06 19:57:32 -0700
commitf0417c5d506e5b562344515f6e68668360456d33 (patch)
treeb5197860eff12d5ce2a5cd20044896bf98d32a66 /OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs
parentcreate osGetAvatarHomeURI (diff)
downloadopensim-SC_OLD-f0417c5d506e5b562344515f6e68668360456d33.zip
opensim-SC_OLD-f0417c5d506e5b562344515f6e68668360456d33.tar.gz
opensim-SC_OLD-f0417c5d506e5b562344515f6e68668360456d33.tar.bz2
opensim-SC_OLD-f0417c5d506e5b562344515f6e68668360456d33.tar.xz
BulletSim: rearrange code and add some tests to try and resolve the
initialization race conditions reported in Mantis 6792. When a region is initializing it seems that the prim initialization code can be interrupted part way through then taints are processed for prims that are not completely there.
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs')
-rwxr-xr-xOpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs b/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs
index d37f29b..87eba33 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs
@@ -322,7 +322,7 @@ public abstract class BSLinkset
322 bool ret = true; 322 bool ret = true;
323 this.ForEachMember((member) => 323 this.ForEachMember((member) =>
324 { 324 {
325 if (member.IsIncomplete || member.PrimAssetState == BSPhysObject.PrimAssetCondition.Waiting) 325 if ((!member.IsInitialized) || member.IsIncomplete || member.PrimAssetState == BSPhysObject.PrimAssetCondition.Waiting)
326 { 326 {
327 ret = false; 327 ret = false;
328 return true; // exit loop 328 return true; // exit loop