diff options
author | Dahlia Trimble | 2009-04-24 19:28:29 +0000 |
---|---|---|
committer | Dahlia Trimble | 2009-04-24 19:28:29 +0000 |
commit | 9c13a93583a71fa4193743c89e6a2d9b7c2b463a (patch) | |
tree | 3c40339e243dc819ca9b83326e4847c7e6d3680d /OpenSim/Region | |
parent | * minor: move user profile test utils to test/common/setup for future reuse (diff) | |
download | opensim-SC-9c13a93583a71fa4193743c89e6a2d9b7c2b463a.zip opensim-SC-9c13a93583a71fa4193743c89e6a2d9b7c2b463a.tar.gz opensim-SC-9c13a93583a71fa4193743c89e6a2d9b7c2b463a.tar.bz2 opensim-SC-9c13a93583a71fa4193743c89e6a2d9b7c2b463a.tar.xz |
Limit hollow size of physics proxy to 95%
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Physics/Meshing/Meshmerizer.cs | 2 | ||||
-rw-r--r-- | 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 1d1067c..3e14fc4 100644 --- a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs +++ b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs | |||
@@ -251,6 +251,8 @@ namespace OpenSim.Region.Physics.Meshing | |||
251 | float profileBegin = (float)primShape.ProfileBegin * 2.0e-5f; | 251 | float profileBegin = (float)primShape.ProfileBegin * 2.0e-5f; |
252 | float profileEnd = 1.0f - (float)primShape.ProfileEnd * 2.0e-5f; | 252 | float profileEnd = 1.0f - (float)primShape.ProfileEnd * 2.0e-5f; |
253 | float profileHollow = (float)primShape.ProfileHollow * 2.0e-5f; | 253 | float profileHollow = (float)primShape.ProfileHollow * 2.0e-5f; |
254 | if (profileHollow > 0.95f) | ||
255 | profileHollow = 0.95f; | ||
254 | 256 | ||
255 | int sides = 4; | 257 | int sides = 4; |
256 | if ((primShape.ProfileCurve & 0x07) == (byte)ProfileShape.EquilateralTriangle) | 258 | if ((primShape.ProfileCurve & 0x07) == (byte)ProfileShape.EquilateralTriangle) |
diff --git a/OpenSim/Region/Physics/Meshing/PrimMesher.cs b/OpenSim/Region/Physics/Meshing/PrimMesher.cs index c397290..ca16b63 100644 --- a/OpenSim/Region/Physics/Meshing/PrimMesher.cs +++ b/OpenSim/Region/Physics/Meshing/PrimMesher.cs | |||
@@ -1232,8 +1232,8 @@ namespace PrimMesher | |||
1232 | this.profileEnd = 0.02f; | 1232 | this.profileEnd = 0.02f; |
1233 | if (profileStart >= profileEnd) | 1233 | if (profileStart >= profileEnd) |
1234 | this.profileStart = profileEnd - 0.02f; | 1234 | this.profileStart = profileEnd - 0.02f; |
1235 | if (hollow > 1.0f) | 1235 | if (hollow > 0.99f) |
1236 | this.hollow = 1.0f; | 1236 | this.hollow = 0.99f; |
1237 | if (hollow < 0.0f) | 1237 | if (hollow < 0.0f) |
1238 | this.hollow = 0.0f; | 1238 | this.hollow = 0.0f; |
1239 | 1239 | ||