OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

0.6.0-stable
Dahlia Trimble 2008-07-07 10:09:35 +00:00
parent 7420f96128
commit c5333af7a2
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
OpenSim/Region/Physics/Meshing/Meshmerizer.cs
View File

@ -526,6 +526,8 @@ namespace OpenSim.Region.Physics.Meshing
// Deal with the hole here // Deal with the hole here
if (hollowFactor > 0) 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); SimpleHull holeHull = BuildHoleHull(primShape, primShape.ProfileShape, primShape.HollowShape, hollowFactor);
if (holeHull != null) if (holeHull != null)
@ -887,6 +889,9 @@ namespace OpenSim.Region.Physics.Meshing
// Deal with the hole here // Deal with the hole here
if (hollowFactor > 0) 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); SimpleHull holeHull = BuildHoleHull(primShape, primShape.ProfileShape, primShape.HollowShape, hollowFactor);
if (holeHull != null) if (holeHull != null)
{ {
@ -1137,6 +1142,9 @@ namespace OpenSim.Region.Physics.Meshing
// Deal with the hole here // Deal with the hole here
if (hollowFactor > 0) 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); SimpleHull holeHull = BuildHoleHull(primShape, primShape.ProfileShape, primShape.HollowShape, hollowFactor);
if (holeHull != null) if (holeHull != null)
{ {