Merge branch 'master' into varregion

Add new region crossing code to varregion

Conflicts:
	OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
	OpenSim/Region/Framework/Scenes/ScenePresence.cs

2 files changed, 9 insertions, 16 deletions

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
         {
diff --git a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
index 1f08b03..d96de4a 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,17 @@ 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];
+                        inMs.Read(readBuffer, 0, 2); // skip first 2 bytes in header
                         int readLen = 0;
-                        while ((readLen = inMs.Read(readBuffer, 0, readBuffer.Length)) > 0)
-                        {
-                            zOut.Write(readBuffer, 0, readLen);
-                        }
-                        zOut.Flush();
+
+                        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();