diff options
| author | Latif Khalifa | 2010-10-24 22:47:53 +0200 |
|---|---|---|
| committer | Melanie | 2010-10-24 23:51:46 +0100 |
| commit | c74c1620a15fcf032a074ed2b979a06f2913e08b (patch) | |
| tree | 570f90a54a035a1cebd160a66369d53d12935053 /OpenSim/Region | |
| parent | Add PRIM_NAME, PRIM_DESC and PRIM_ROT_LOCAL (diff) | |
| download | opensim-SC-c74c1620a15fcf032a074ed2b979a06f2913e08b.zip opensim-SC-c74c1620a15fcf032a074ed2b979a06f2913e08b.tar.gz opensim-SC-c74c1620a15fcf032a074ed2b979a06f2913e08b.tar.bz2 opensim-SC-c74c1620a15fcf032a074ed2b979a06f2913e08b.tar.xz | |
* Updated libomv to r3461
Main reason for upgrade is to revert API change that was introduced in order to support headerless binary LLSD decoding needed for deserialization of the mesh assets, which turned out to be unnecessary as we can transparently decode both kinds.
Diffstat (limited to 'OpenSim/Region')
| -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 | } |