added a hollow size constraint to box, cylinder, and prism prim meshes to prevent a possible sim lockup

1 files changed, 8 insertions, 0 deletions

diff --git a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
index aabfdaf..4511c4c 100644
--- a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
+++ b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
@@ -526,6 +526,8 @@ namespace OpenSim.Region.Physics.Meshing
             // Deal with the hole here
             if (hollowFactor > 0)
             {
+                if (hollowFactor < 1000)
+                    hollowFactor = 1000;  // some sane minimum for our beloved SimpleHull routines
 
                 SimpleHull holeHull = BuildHoleHull(primShape, primShape.ProfileShape, primShape.HollowShape, hollowFactor);
                 if (holeHull != null)
@@ -887,6 +889,9 @@ namespace OpenSim.Region.Physics.Meshing
             // Deal with the hole here
             if (hollowFactor > 0)
             {
+                if (hollowFactor < 1000)
+                    hollowFactor = 1000;  // some sane minimum for our beloved SimpleHull routines
+
                 SimpleHull holeHull = BuildHoleHull(primShape, primShape.ProfileShape, primShape.HollowShape, hollowFactor);
                 if (holeHull != null)
                 {
@@ -1137,6 +1142,9 @@ namespace OpenSim.Region.Physics.Meshing
             // Deal with the hole here
             if (hollowFactor > 0)
             {
+                if (hollowFactor < 1000)
+                    hollowFactor = 1000;  // some sane minimum for our beloved SimpleHull routines
+
                 SimpleHull holeHull = BuildHoleHull(primShape, primShape.ProfileShape, primShape.HollowShape, hollowFactor);
                 if (holeHull != null)
                 {