aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authordahlia2013-12-06 16:24:44 -0800
committerdahlia2013-12-06 16:24:44 -0800
commitc0380d1bfe596afe33659cc69ae99a09018f9908 (patch)
tree22afde84f37846e2208068e010b9328a6587b009
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-c0380d1bfe596afe33659cc69ae99a09018f9908.zip
opensim-SC_OLD-c0380d1bfe596afe33659cc69ae99a09018f9908.tar.gz
opensim-SC_OLD-c0380d1bfe596afe33659cc69ae99a09018f9908.tar.bz2
opensim-SC_OLD-c0380d1bfe596afe33659cc69ae99a09018f9908.tar.xz
apparently mono DeflateStream has no CopyTo method =(
-rw-r--r--OpenSim/Region/Physics/Meshing/Meshmerizer.cs6
1 files changed, 5 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
index e313a30..d96de4a 100644
--- a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
+++ b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
@@ -566,8 +566,12 @@ namespace OpenSim.Region.Physics.Meshing
566 { 566 {
567 byte[] readBuffer = new byte[2048]; 567 byte[] readBuffer = new byte[2048];
568 inMs.Read(readBuffer, 0, 2); // skip first 2 bytes in header 568 inMs.Read(readBuffer, 0, 2); // skip first 2 bytes in header
569 int readLen = 0;
569 570
570 decompressionStream.CopyTo(outMs); 571 while ((readLen = decompressionStream.Read(readBuffer, 0, readBuffer.Length)) > 0)
572 outMs.Write(readBuffer, 0, readLen);
573
574 outMs.Flush();
571 575
572 outMs.Seek(0, SeekOrigin.Begin); 576 outMs.Seek(0, SeekOrigin.Begin);
573 577