diff options
| author | Melanie | 2010-12-12 01:20:46 +0000 |
|---|---|---|
| committer | Melanie | 2010-12-12 01:20:46 +0000 |
| commit | 8aa63093b118f257eff87c003e668249c34f5162 (patch) | |
| tree | a5ea5448482d899729c29079ed0dab8394bb9be4 /OpenSim/Region/Physics | |
| parent | Fix border fence for physicals. Fix llRotLookAt() for Vehicles. (diff) | |
| parent | Revert "Another stab at mantis #5256" (diff) | |
| download | opensim-SC_OLD-8aa63093b118f257eff87c003e668249c34f5162.zip opensim-SC_OLD-8aa63093b118f257eff87c003e668249c34f5162.tar.gz opensim-SC_OLD-8aa63093b118f257eff87c003e668249c34f5162.tar.bz2 opensim-SC_OLD-8aa63093b118f257eff87c003e668249c34f5162.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/Physics')
| -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); |