From 4651cd1f50add12aca5d45bdde1b9990ce3c29de Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Wed, 18 Jun 2014 23:01:39 -0700
Subject: BulletSim: stop processing linkset child when it is discovered that
 the child doesn't have a physical shape. Another attempt at fixing Mantis
 7191.

---
 OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs | 1 +
 1 file changed, 1 insertion(+)

(limited to 'OpenSim/Region')

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs
index 67cb2f6..5217452 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs
@@ -404,6 +404,7 @@ public sealed class BSLinksetCompound : BSLinkset
                         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);
+                        return false;   // 'false' says to move onto the next child in the list
                     }
                 }
 
-- 
cgit v1.1