From c5333af7a27576769ee80c74e09ab2dbc98d2ed4 Mon Sep 17 00:00:00 2001 From: Dahlia Trimble Date: Mon, 7 Jul 2008 10:09:35 +0000 Subject: [PATCH] added a hollow size constraint to box, cylinder, and prism prim meshes to prevent a possible sim lockup --- OpenSim/Region/Physics/Meshing/Meshmerizer.cs | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs index aabfdaf3fb..4511c4cb19 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) {