diff options
| author | Melanie | 2011-12-01 12:16:59 +0000 |
|---|---|---|
| committer | Melanie | 2011-12-01 12:16:59 +0000 |
| commit | b60ff651a3912f7d7830cac40752218efba858d8 (patch) | |
| tree | ba22de2341b996cfeb1f7da31f650e206cb1d76f /OpenSim/Region/Physics | |
| parent | Merge branch 'master' into bigmerge (diff) | |
| parent | Provide more user feedback when "debug http" is set (diff) | |
| download | opensim-SC_OLD-b60ff651a3912f7d7830cac40752218efba858d8.zip opensim-SC_OLD-b60ff651a3912f7d7830cac40752218efba858d8.tar.gz opensim-SC_OLD-b60ff651a3912f7d7830cac40752218efba858d8.tar.bz2 opensim-SC_OLD-b60ff651a3912f7d7830cac40752218efba858d8.tar.xz | |
Merge branch 'master' into bigmerge
Diffstat (limited to 'OpenSim/Region/Physics')
| -rw-r--r-- | OpenSim/Region/Physics/Meshing/Meshmerizer.cs | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs index 53d5e4c..f15e81b 100644 --- a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs +++ b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs | |||
| @@ -171,16 +171,13 @@ namespace OpenSim.Region.Physics.Meshing | |||
| 171 | 171 | ||
| 172 | foreach (Vector3 v in meshIn.getVertexList()) | 172 | foreach (Vector3 v in meshIn.getVertexList()) |
| 173 | { | 173 | { |
| 174 | if (v != null) | 174 | if (v.X < minX) minX = v.X; |
| 175 | { | 175 | if (v.Y < minY) minY = v.Y; |
| 176 | if (v.X < minX) minX = v.X; | 176 | if (v.Z < minZ) minZ = v.Z; |
| 177 | if (v.Y < minY) minY = v.Y; | ||
| 178 | if (v.Z < minZ) minZ = v.Z; | ||
| 179 | 177 | ||
| 180 | if (v.X > maxX) maxX = v.X; | 178 | if (v.X > maxX) maxX = v.X; |
| 181 | if (v.Y > maxY) maxY = v.Y; | 179 | if (v.Y > maxY) maxY = v.Y; |
| 182 | if (v.Z > maxZ) maxZ = v.Z; | 180 | if (v.Z > maxZ) maxZ = v.Z; |
| 183 | } | ||
| 184 | } | 181 | } |
| 185 | 182 | ||
| 186 | return CreateSimpleBoxMesh(minX, maxX, minY, maxY, minZ, maxZ); | 183 | return CreateSimpleBoxMesh(minX, maxX, minY, maxY, minZ, maxZ); |