aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/Meshing
diff options
context:
space:
mode:
authorDahlia Trimble2008-07-07 10:09:35 +0000
committerDahlia Trimble2008-07-07 10:09:35 +0000
commitc5333af7a27576769ee80c74e09ab2dbc98d2ed4 (patch)
tree9c598aa87e2d294a671c762cc673219fed7803e7 /OpenSim/Region/Physics/Meshing
parentswitching to safer locks. (diff)
downloadopensim-SC_OLD-c5333af7a27576769ee80c74e09ab2dbc98d2ed4.zip
opensim-SC_OLD-c5333af7a27576769ee80c74e09ab2dbc98d2ed4.tar.gz
opensim-SC_OLD-c5333af7a27576769ee80c74e09ab2dbc98d2ed4.tar.bz2
opensim-SC_OLD-c5333af7a27576769ee80c74e09ab2dbc98d2ed4.tar.xz
added a hollow size constraint to box, cylinder, and prism prim meshes to prevent a possible sim lockup
Diffstat (limited to 'OpenSim/Region/Physics/Meshing')
-rw-r--r--OpenSim/Region/Physics/Meshing/Meshmerizer.cs8
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
526 // Deal with the hole here 526 // Deal with the hole here
527 if (hollowFactor > 0) 527 if (hollowFactor > 0)
528 { 528 {
529 if (hollowFactor < 1000)
530 hollowFactor = 1000; // some sane minimum for our beloved SimpleHull routines
529 531
530 SimpleHull holeHull = BuildHoleHull(primShape, primShape.ProfileShape, primShape.HollowShape, hollowFactor); 532 SimpleHull holeHull = BuildHoleHull(primShape, primShape.ProfileShape, primShape.HollowShape, hollowFactor);
531 if (holeHull != null) 533 if (holeHull != null)
@@ -887,6 +889,9 @@ namespace OpenSim.Region.Physics.Meshing
887 // Deal with the hole here 889 // Deal with the hole here
888 if (hollowFactor > 0) 890 if (hollowFactor > 0)
889 { 891 {
892 if (hollowFactor < 1000)
893 hollowFactor = 1000; // some sane minimum for our beloved SimpleHull routines
894
890 SimpleHull holeHull = BuildHoleHull(primShape, primShape.ProfileShape, primShape.HollowShape, hollowFactor); 895 SimpleHull holeHull = BuildHoleHull(primShape, primShape.ProfileShape, primShape.HollowShape, hollowFactor);
891 if (holeHull != null) 896 if (holeHull != null)
892 { 897 {
@@ -1137,6 +1142,9 @@ namespace OpenSim.Region.Physics.Meshing
1137 // Deal with the hole here 1142 // Deal with the hole here
1138 if (hollowFactor > 0) 1143 if (hollowFactor > 0)
1139 { 1144 {
1145 if (hollowFactor < 1000)
1146 hollowFactor = 1000; // some sane minimum for our beloved SimpleHull routines
1147
1140 SimpleHull holeHull = BuildHoleHull(primShape, primShape.ProfileShape, primShape.HollowShape, hollowFactor); 1148 SimpleHull holeHull = BuildHoleHull(primShape, primShape.ProfileShape, primShape.HollowShape, hollowFactor);
1141 if (holeHull != null) 1149 if (holeHull != null)
1142 { 1150 {