BulletSim: add BSLinkset.AllPartsComplete that checks of all linkset members are not Incomplete and not waiting for assets. Change BSPrimLinkable to use AllPartsComplete.

1 files changed, 1 insertions, 21 deletions

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs
index 9301e52..c293e8c 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs
@@ -60,27 +60,7 @@ public class BSPrimLinkable : BSPrimDisplaced
         {
             // A linkset is incomplete when base objects are incomplete, waiting for assets,
             //     or being rebuilt.
-            bool ret = false;
-            if (base.IsIncomplete || Linkset.RebuildScheduled)
-            {
-                ret = true;
-            }
-            else
-            {
-                if (Linkset.IsRoot(this))
-                {
-                    Linkset.ForEachMember((member) =>
-                    {
-                        if (member.PrimAssetState == PrimAssetCondition.Waiting)
-                        {
-                            ret = true;
-                            return true;
-                        }
-                        return false;
-                    });
-                }
-            }
-            return ret;
+            return (base.IsIncomplete || Linkset.RebuildScheduled || !Linkset.AllPartsComplete);
         }
     }