diff options
| author | Melanie | 2010-10-25 01:24:30 +0100 |
|---|---|---|
| committer | Melanie | 2010-10-25 01:24:30 +0100 |
| commit | ac370cf57b8807db89747e7c40d3727de34274cf (patch) | |
| tree | a40ea7f045d80c9ac55425012dca8c1950b2b885 /OpenSim/Region/Physics | |
| parent | Add PRIM_NAME, PRIM_DESC and PRIM_ROT_LOCAL (diff) | |
| parent | * Updated libomv to r3461 (diff) | |
| download | opensim-SC_OLD-ac370cf57b8807db89747e7c40d3727de34274cf.zip opensim-SC_OLD-ac370cf57b8807db89747e7c40d3727de34274cf.tar.gz opensim-SC_OLD-ac370cf57b8807db89747e7c40d3727de34274cf.tar.bz2 opensim-SC_OLD-ac370cf57b8807db89747e7c40d3727de34274cf.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/Physics/Meshing/Meshmerizer.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs index 1257804..d770ad1 100644 --- a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs +++ b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs | |||
| @@ -287,7 +287,7 @@ namespace OpenSim.Region.Physics.Meshing | |||
| 287 | long start = 0; | 287 | long start = 0; |
| 288 | using (MemoryStream data = new MemoryStream(primShape.SculptData)) | 288 | using (MemoryStream data = new MemoryStream(primShape.SculptData)) |
| 289 | { | 289 | { |
| 290 | meshOsd = (OSDMap)OSDParser.DeserializeLLSDBinary(data, true); | 290 | meshOsd = (OSDMap)OSDParser.DeserializeLLSDBinary(data); |
| 291 | start = data.Position; | 291 | start = data.Position; |
| 292 | } | 292 | } |
| 293 | 293 | ||
| @@ -324,7 +324,7 @@ namespace OpenSim.Region.Physics.Meshing | |||
| 324 | 324 | ||
| 325 | byte[] decompressedBuf = outMs.GetBuffer(); | 325 | byte[] decompressedBuf = outMs.GetBuffer(); |
| 326 | 326 | ||
| 327 | decodedMeshOsd = OSDParser.DeserializeLLSDBinary(decompressedBuf, true); | 327 | decodedMeshOsd = OSDParser.DeserializeLLSDBinary(decompressedBuf); |
| 328 | } | 328 | } |
| 329 | } | 329 | } |
| 330 | } | 330 | } |