From 9c13a93583a71fa4193743c89e6a2d9b7c2b463a Mon Sep 17 00:00:00 2001 From: Dahlia Trimble Date: Fri, 24 Apr 2009 19:28:29 +0000 Subject: [PATCH] Limit hollow size of physics proxy to 95% --- OpenSim/Region/Physics/Meshing/Meshmerizer.cs | 2 ++ OpenSim/Region/Physics/Meshing/PrimMesher.cs | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs index 1d1067c76d..3e14fc4edc 100644 --- a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs +++ b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs @@ -251,6 +251,8 @@ namespace OpenSim.Region.Physics.Meshing float profileBegin = (float)primShape.ProfileBegin * 2.0e-5f; float profileEnd = 1.0f - (float)primShape.ProfileEnd * 2.0e-5f; float profileHollow = (float)primShape.ProfileHollow * 2.0e-5f; + if (profileHollow > 0.95f) + profileHollow = 0.95f; int sides = 4; if ((primShape.ProfileCurve & 0x07) == (byte)ProfileShape.EquilateralTriangle) diff --git a/OpenSim/Region/Physics/Meshing/PrimMesher.cs b/OpenSim/Region/Physics/Meshing/PrimMesher.cs index c397290195..ca16b63aac 100644 --- a/OpenSim/Region/Physics/Meshing/PrimMesher.cs +++ b/OpenSim/Region/Physics/Meshing/PrimMesher.cs @@ -1232,8 +1232,8 @@ namespace PrimMesher this.profileEnd = 0.02f; if (profileStart >= profileEnd) this.profileStart = profileEnd - 0.02f; - if (hollow > 1.0f) - this.hollow = 1.0f; + if (hollow > 0.99f) + this.hollow = 0.99f; if (hollow < 0.0f) this.hollow = 0.0f;