From d25265ae82a3ac3afc32f65f820c9ed0b2bff31f Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Tue, 28 Jan 2014 15:58:45 -0800
Subject: Fix terrain tests by properly initializing low detail terrain to zero
 height. Also remove PI heightmap test as new heightmaps only have two
 significant digits.

---
 OpenSim/Framework/TerrainData.cs | 1 +
 1 file changed, 1 insertion(+)

(limited to 'OpenSim/Framework')

diff --git a/OpenSim/Framework/TerrainData.cs b/OpenSim/Framework/TerrainData.cs
index 1c52a69..d1e0e7e 100644
--- a/OpenSim/Framework/TerrainData.cs
+++ b/OpenSim/Framework/TerrainData.cs
@@ -274,6 +274,7 @@ namespace OpenSim.Framework
             m_taint = new bool[SizeX / Constants.TerrainPatchSize, SizeY / Constants.TerrainPatchSize];
             // m_log.DebugFormat("{0} new by dimensions. sizeX={1}, sizeY={2}, sizeZ={3}", LogHeader, SizeX, SizeY, SizeZ);
             ClearTaint();
+            ClearLand(0f);
         }
 
         public HeightmapTerrainData(short[] cmap, float pCompressionFactor, int pX, int pY, int pZ) : this(pX, pY, pZ)
-- 
cgit v1.1


From 0c3493f61965ab3fcd16217f72ed2ae7a347130c Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Tue, 28 Jan 2014 16:25:01 -0800
Subject: clear land tainting when tested. Then testing, pass scene to
 LandObject as now needed to get region size

---
 OpenSim/Framework/TerrainData.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Framework')

diff --git a/OpenSim/Framework/TerrainData.cs b/OpenSim/Framework/TerrainData.cs
index d1e0e7e..9325df2 100644
--- a/OpenSim/Framework/TerrainData.cs
+++ b/OpenSim/Framework/TerrainData.cs
@@ -160,7 +160,11 @@ namespace OpenSim.Framework
 
         public override bool IsTaintedAt(int xx, int yy)
         {
-            return m_taint[xx / Constants.TerrainPatchSize, yy / Constants.TerrainPatchSize];
+            int tx = xx / Constants.TerrainPatchSize;
+            int ty = yy / Constants.TerrainPatchSize;
+            bool ret =  m_taint[tx, ty];
+            m_taint[tx, ty] = false;
+            return ret;
         }
 
         // TerrainData.GetDatabaseBlob
-- 
cgit v1.1


From b8e22f02e79e84d29e65a46751d68235f93aa8e8 Mon Sep 17 00:00:00 2001
From: Oren Hurvitz
Date: Thu, 19 Dec 2013 14:08:46 +0200
Subject: Make sure Web streams are disposed after use

---
 OpenSim/Framework/WebUtil.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'OpenSim/Framework')

diff --git a/OpenSim/Framework/WebUtil.cs b/OpenSim/Framework/WebUtil.cs
index bcf6af8..54a6c0c 100644
--- a/OpenSim/Framework/WebUtil.cs
+++ b/OpenSim/Framework/WebUtil.cs
@@ -1030,7 +1030,7 @@ namespace OpenSim.Framework
                     finally
                     {
                         if (requestStream != null)
-                            requestStream.Close();
+                            requestStream.Dispose();
 
                         // capture how much time was spent writing
                         tickdata = Util.EnvironmentTickCountSubtract(tickstart);
@@ -1183,7 +1183,7 @@ namespace OpenSim.Framework
                 finally
                 {
                     if (requestStream != null)
-                        requestStream.Close();
+                        requestStream.Dispose();
 
                     // capture how much time was spent writing
                     tickdata = Util.EnvironmentTickCountSubtract(tickstart);
@@ -1268,4 +1268,4 @@ namespace OpenSim.Framework
             return deserial;
         }
     }
-}
\ No newline at end of file
+}
-- 
cgit v1.1