Merge branch 'master' into bigmerge

This commit is contained in:
Melanie
2011-12-01 12:16:59 +00:00
8 changed files with 116 additions and 55 deletions

View File

@@ -171,16 +171,13 @@ namespace OpenSim.Region.Physics.Meshing
foreach (Vector3 v in meshIn.getVertexList())
{
if (v != null)
{
if (v.X < minX) minX = v.X;
if (v.Y < minY) minY = v.Y;
if (v.Z < minZ) minZ = v.Z;
if (v.X < minX) minX = v.X;
if (v.Y < minY) minY = v.Y;
if (v.Z < minZ) minZ = v.Z;
if (v.X > maxX) maxX = v.X;
if (v.Y > maxY) maxY = v.Y;
if (v.Z > maxZ) maxZ = v.Z;
}
if (v.X > maxX) maxX = v.X;
if (v.Y > maxY) maxY = v.Y;
if (v.Z > maxZ) maxZ = v.Z;
}
return CreateSimpleBoxMesh(minX, maxX, minY, maxY, minZ, maxZ);