use System.IO.Compression.DeflateStream for mesh decompression in an attempt to reduce mesh asset decoding failures

2 files changed, 5 insertions, 10 deletions

diff --git a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
index 1f08b03..e313a30 100644
--- a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
+++ b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
@@ -40,7 +40,6 @@ using log4net;
 using Nini.Config;
 using System.Reflection;
 using System.IO;
-using ComponentAce.Compression.Libs.zlib;
 
 namespace OpenSim.Region.Physics.Meshing
 {
@@ -549,7 +548,6 @@ namespace OpenSim.Region.Physics.Meshing
             return true;
         }
 
-
         /// <summary>
         /// decompresses a gzipped OSD object
         /// </summary>
@@ -564,15 +562,13 @@ namespace OpenSim.Region.Physics.Meshing
             {
                 using (MemoryStream outMs = new MemoryStream())
                 {
-                    using (ZOutputStream zOut = new ZOutputStream(outMs))
+                    using (DeflateStream decompressionStream = new DeflateStream(inMs, CompressionMode.Decompress))
                     {
                         byte[] readBuffer = new byte[2048];
-                        int readLen = 0;
-                        while ((readLen = inMs.Read(readBuffer, 0, readBuffer.Length)) > 0)
-                        {
-                            zOut.Write(readBuffer, 0, readLen);
-                        }
-                        zOut.Flush();
+                        inMs.Read(readBuffer, 0, 2); // skip first 2 bytes in header
+
+                        decompressionStream.CopyTo(outMs);
+
                         outMs.Seek(0, SeekOrigin.Begin);
 
                         byte[] decompressedBuf = outMs.GetBuffer();
diff --git a/prebuild.xml b/prebuild.xml
index de3b89b..f6e0f4b 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -585,7 +585,6 @@
       <Reference name="OpenSim.Framework.Console"/>
       <Reference name="OpenSim.Region.Physics.Manager"/>
       <Reference name="log4net" path="../../../../bin/"/>
-      <Reference name="zlib.net" path="../../../../bin/"/>
 
       <Files>
         <Match pattern="*.cs" recurse="true"/>