From 1496de7ce99079d3d7bf046db088c3d6e2a97bcb Mon Sep 17 00:00:00 2001
From: dahlia
Date: Fri, 6 Dec 2013 15:58:19 -0800
Subject: use System.IO.Compression.DeflateStream for mesh decompression in an
 attempt to reduce mesh asset decoding failures

---
 OpenSim/Region/Physics/Meshing/Meshmerizer.cs | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

(limited to 'OpenSim/Region/Physics')

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();
-- 
cgit v1.1


From c0380d1bfe596afe33659cc69ae99a09018f9908 Mon Sep 17 00:00:00 2001
From: dahlia
Date: Fri, 6 Dec 2013 16:24:44 -0800
Subject: apparently mono DeflateStream has no CopyTo method =(

---
 OpenSim/Region/Physics/Meshing/Meshmerizer.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Region/Physics')

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
                     {
                         byte[] readBuffer = new byte[2048];
                         inMs.Read(readBuffer, 0, 2); // skip first 2 bytes in header
+                        int readLen = 0;
 
-                        decompressionStream.CopyTo(outMs);
+                        while ((readLen = decompressionStream.Read(readBuffer, 0, readBuffer.Length)) > 0)
+                            outMs.Write(readBuffer, 0, readLen);
+
+                        outMs.Flush();
 
                         outMs.Seek(0, SeekOrigin.Begin);
 
-- 
cgit v1.1


From 54cc22976868dcdc0dd0143a0134fba7392af525 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 14 Dec 2013 00:10:32 +0000
Subject: Fix TestSitAndStandWithNoSitTarget NPC and SP tests.

These stopped working because current code calculates sit heights based on avatar physics rather than appearance data.
Also changed BasicPhysics to not divide Z param of all set sizes by 2 - there's no obvious good reason for this and basicphysics is only used in tests
---
 OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsActor.cs | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

(limited to 'OpenSim/Region/Physics')

diff --git a/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsActor.cs b/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsActor.cs
index e43136a..0d17e0e 100644
--- a/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsActor.cs
+++ b/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsActor.cs
@@ -118,14 +118,7 @@ namespace OpenSim.Region.Physics.BasicPhysicsPlugin
 
         public override Vector3 Position { get; set; }
 
-        public override Vector3 Size
-        {
-            get { return _size; }
-            set {
-                  _size = value;
-                  _size.Z = _size.Z / 2.0f;
-                }
-        }
+        public override Vector3 Size { get; set; }
 
         public override PrimitiveBaseShape Shape
         {
-- 
cgit v1.1