diff options
author | justincc | 2010-12-15 00:35:36 +0000 |
---|---|---|
committer | justincc | 2010-12-15 00:35:36 +0000 |
commit | b643661938881af6fc782d39e52040ed6d16f03f (patch) | |
tree | 162e0667718b2f68e5f4e90cd10f30e6fa374cbb /OpenSim/Region/Physics | |
parent | replace ode.dll with one built without asserts turned on (diff) | |
parent | fix mistake in last change of local.include (diff) | |
download | opensim-SC-b643661938881af6fc782d39e52040ed6d16f03f.zip opensim-SC-b643661938881af6fc782d39e52040ed6d16f03f.tar.gz opensim-SC-b643661938881af6fc782d39e52040ed6d16f03f.tar.bz2 opensim-SC-b643661938881af6fc782d39e52040ed6d16f03f.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Physics/Meshing/Meshmerizer.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Physics/Meshing/SculptMesh.cs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs index 3386e72..211a0a7 100644 --- a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs +++ b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs | |||
@@ -311,7 +311,7 @@ namespace OpenSim.Region.Physics.Meshing | |||
311 | OSD decodedMeshOsd = new OSD(); | 311 | OSD decodedMeshOsd = new OSD(); |
312 | byte[] meshBytes = new byte[physSize]; | 312 | byte[] meshBytes = new byte[physSize]; |
313 | System.Buffer.BlockCopy(primShape.SculptData, physOffset, meshBytes, 0, physSize); | 313 | System.Buffer.BlockCopy(primShape.SculptData, physOffset, meshBytes, 0, physSize); |
314 | byte[] decompressed = new byte[physSize * 5]; | 314 | // byte[] decompressed = new byte[physSize * 5]; |
315 | try | 315 | try |
316 | { | 316 | { |
317 | using (MemoryStream inMs = new MemoryStream(meshBytes)) | 317 | using (MemoryStream inMs = new MemoryStream(meshBytes)) |
diff --git a/OpenSim/Region/Physics/Meshing/SculptMesh.cs b/OpenSim/Region/Physics/Meshing/SculptMesh.cs index e58eb89..4a7f3ad 100644 --- a/OpenSim/Region/Physics/Meshing/SculptMesh.cs +++ b/OpenSim/Region/Physics/Meshing/SculptMesh.cs | |||
@@ -375,7 +375,7 @@ namespace PrimMesher | |||
375 | 375 | ||
376 | int coordsDown = rows.Count; | 376 | int coordsDown = rows.Count; |
377 | int coordsAcross = rows[0].Count; | 377 | int coordsAcross = rows[0].Count; |
378 | int lastColumn = coordsAcross - 1; | 378 | // int lastColumn = coordsAcross - 1; |
379 | 379 | ||
380 | float widthUnit = 1.0f / (coordsAcross - 1); | 380 | float widthUnit = 1.0f / (coordsAcross - 1); |
381 | float heightUnit = 1.0f / (coordsDown - 1); | 381 | float heightUnit = 1.0f / (coordsDown - 1); |