aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorJonathan Freedman2010-10-25 22:27:35 -0400
committerJonathan Freedman2010-10-25 22:27:35 -0400
commit5da2743c374907044be0480297b3f21d7538faef (patch)
treedc7c535b0ea0092c35681b0c77400c3e26b25971 /OpenSim/Region
parentMerge branch 'master' into mantis5110 (diff)
parent* Updated libomv to r3461 (diff)
downloadopensim-SC_OLD-5da2743c374907044be0480297b3f21d7538faef.zip
opensim-SC_OLD-5da2743c374907044be0480297b3f21d7538faef.tar.gz
opensim-SC_OLD-5da2743c374907044be0480297b3f21d7538faef.tar.bz2
opensim-SC_OLD-5da2743c374907044be0480297b3f21d7538faef.tar.xz
Merge branch 'master' into mantis5110
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Physics/Meshing/Meshmerizer.cs4
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 }