* Creates Util.UTF8 and switches some references of Encoding.UTF8 to Util.UTF8 (not all references were switched since not all OpenSim libraries reference OpenSim.Framework)

* Shrinks the largest in-memory object, the LLRAW.HeightmapLookupValue struct (only used for exporting to LLRAW terrain files), to the minimum possible size. This seems to have the odd side effect of cutting the size of the two double[256,256] terrain objects in half. Possibly an alignment optimization?

1 files changed, 9 insertions, 5 deletions

diff --git a/OpenSim/Data/SQLite/SQLiteRegionData.cs b/OpenSim/Data/SQLite/SQLiteRegionData.cs
index ea076fe..a3ae6ea 100644
--- a/OpenSim/Data/SQLite/SQLiteRegionData.cs
+++ b/OpenSim/Data/SQLite/SQLiteRegionData.cs
@@ -581,13 +581,17 @@ namespace OpenSim.Data.SQLite
                         if (row.Read())
                         {
                             // TODO: put this into a function
-                            MemoryStream str = new MemoryStream((byte[]) row["Heightfield"]);
-                            BinaryReader br = new BinaryReader(str);
-                            for (int x = 0; x < (int)Constants.RegionSize; x++)
+                            using (MemoryStream str = new MemoryStream((byte[])row["Heightfield"]))
                             {
-                                for (int y = 0; y < (int)Constants.RegionSize; y++)
+                                using (BinaryReader br = new BinaryReader(str))
                                 {
-                                    terret[x, y] = br.ReadDouble();
+                                    for (int x = 0; x < (int)Constants.RegionSize; x++)
+                                    {
+                                        for (int y = 0; y < (int)Constants.RegionSize; y++)
+                                        {
+                                            terret[x, y] = br.ReadDouble();
+                                        }
+                                    }
                                 }
                             }
                             rev = (int) row["Revision"];