ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-09 02:36:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

minor cleanup on mesh decompress code

Browse Source
This commit is contained in:
UbitUmarov
2019-04-02 10:13:26 +01:00
parent 2739b2f5cc
commit ba66d2d3c1
3 changed files with 19 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
OpenSim/Region/PhysicsModules/Meshing/Meshmerizer/Meshmerizer.cs
View File

@@ -597,28 +597,22 @@ namespace OpenSim.Region.PhysicsModule.Meshing
{
OSD decodedOsd = null;
using (MemoryStream inMs = new MemoryStream(meshBytes))
using (MemoryStream outMs = new MemoryStream())
{
using (MemoryStream outMs = new MemoryStream())
using (MemoryStream inMs = new MemoryStream(meshBytes))
{
using (DeflateStream decompressionStream = new DeflateStream(inMs, CompressionMode.Decompress))
{
byte[] readBuffer = new byte[2048];
byte[] readBuffer = new byte[8192];
inMs.Read(readBuffer, 0, 2); // skip first 2 bytes in header
int readLen = 0;
while ((readLen = decompressionStream.Read(readBuffer, 0, readBuffer.Length)) > 0)
outMs.Write(readBuffer, 0, readLen);
outMs.Flush();
outMs.Seek(0, SeekOrigin.Begin);
byte[] decompressedBuf = outMs.GetBuffer();
decodedOsd = OSDParser.DeserializeLLSDBinary(decompressedBuf);
}
}
outMs.Seek(0, SeekOrigin.Begin);
decodedOsd = OSDParser.DeserializeLLSDBinary(outMs);
}
return decodedOsd;
}