BulletSim: rearrange code for sensing whether shapes have been

constructed.
Add routine to check for failed and use that method rather than
    checking individual state.

1 files changed, 13 insertions, 12 deletions

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs
index 5a9e9ff..6586099 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs
@@ -401,20 +401,21 @@ public sealed class BSLinksetCompound : BSLinkset
                     // The linkset must be in an intermediate state where all the children have not yet
                     //    been constructed. This sometimes happens on startup when everything is getting
                     //    built and some shapes have to wait for assets to be read in.
-                    // Just skip this child for the moment and cause the shape to be rebuilt next tick.
+                    // Just skip this linkset for the moment and cause the shape to be rebuilt next tick.
                     // One problem might be that the shape is broken somehow and it never becomes completely
                     //    available. This might cause the rebuild to happen over and over.
-                    if (LinksetRebuildFailureLoopPrevention-- > 0)
-                    {
-                        LinksetRoot.ForceBodyShapeRebuild(false);
-                        DetailLog("{0},BSLinksetCompound.RecomputeLinksetCompound,addChildWithNoShape,indx={1},cShape={2},offPos={3},offRot={4}",
-                                        LinksetRoot.LocalID, cPrim.LinksetChildIndex, childShape, offsetPos, offsetRot);
-                        // Output an annoying warning. It should only happen once but if it keeps coming out,
-                        //    the user knows there is something wrong and will report it.
-                        m_physicsScene.Logger.WarnFormat("{0} Linkset rebuild warning. If this happens more than one or two times, please report in Mantis 7191", LogHeader);
-                        m_physicsScene.Logger.WarnFormat("{0} pName={1}, childIdx={2}, shape={3}",
-                                        LogHeader, LinksetRoot.Name, cPrim.LinksetChildIndex, childShape);
-                    }
+                    LinksetRoot.ForceBodyShapeRebuild(false);
+                    DetailLog("{0},BSLinksetCompound.RecomputeLinksetCompound,addChildWithNoShape,indx={1},cShape={2},offPos={3},offRot={4}",
+                                    LinksetRoot.LocalID, cPrim.LinksetChildIndex, childShape, offsetPos, offsetRot);
+                    // Output an annoying warning. It should only happen once but if it keeps coming out,
+                    //    the user knows there is something wrong and will report it.
+                    m_physicsScene.Logger.WarnFormat("{0} Linkset rebuild warning. If this happens more than one or two times, please report in Mantis 7191", LogHeader);
+                    m_physicsScene.Logger.WarnFormat("{0} pName={1}, childIdx={2}, shape={3}",
+                                    LogHeader, LinksetRoot.Name, cPrim.LinksetChildIndex, childShape);
+
+                    // This causes the loop to bail on building the rest of this linkset.
+                    // The rebuild operation should fix it up or declare the object unbuildable.
+                    return true;
                 }
 
                 return false;   // 'false' says to move onto the next child in the list