1 files changed, 24 insertions, 48 deletions

diff --git a/OpenSim/Data/PGSQL/PGSQLSimulationData.cs b/OpenSim/Data/PGSQL/PGSQLSimulationData.cs
index cd02e05..77d87d4 100644
--- a/OpenSim/Data/PGSQL/PGSQLSimulationData.cs
+++ b/OpenSim/Data/PGSQL/PGSQLSimulationData.cs
@@ -540,26 +540,28 @@ namespace OpenSim.Data.PGSQL
                             where ""RegionUUID"" = :RegionUUID order by ""Revision"" desc limit 1; ";
 
             using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
-            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
             {
-                // PGSqlParameter param = new PGSqlParameter();
-                cmd.Parameters.Add(_Database.CreateParameter("RegionUUID", regionID));
-                conn.Open();
-                using (NpgsqlDataReader reader = cmd.ExecuteReader())
+                using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
                 {
-                    int rev;
-                    if (reader.Read())
-                    {
-                        rev = Convert.ToInt32(reader["Revision"]);
-                        byte[] blob = (byte[])reader["Heightfield"];
-                        terrData = TerrainData.CreateFromDatabaseBlobFactory(pSizeX, pSizeY, pSizeZ, rev, blob);
-                    }
-                    else
+                    // PGSqlParameter param = new PGSqlParameter();
+                    cmd.Parameters.Add(_Database.CreateParameter("RegionUUID", regionID));
+                    conn.Open();
+                    using (NpgsqlDataReader reader = cmd.ExecuteReader())
                     {
-                        _Log.Info("[REGION DB]: No terrain found for region");
-                        return null;
+                        int rev;
+                        if (reader.Read())
+                        {
+                            rev = Convert.ToInt32(reader["Revision"]);
+                            byte[] blob = (byte[])reader["Heightfield"];
+                            terrData = TerrainData.CreateFromDatabaseBlobFactory(pSizeX, pSizeY, pSizeZ, rev, blob);
+                        }
+                        else
+                        {
+                            _Log.Info("[REGION DB]: No terrain found for region");
+                            return null;
+                        }
+                        _Log.Info("[REGION DB]: Loaded terrain revision r" + rev);
                     }
-                    _Log.Info("[REGION DB]: Loaded terrain revision r" + rev);
                 }
             }
 
@@ -588,8 +590,11 @@ namespace OpenSim.Data.PGSQL
                     cmd.Parameters.Add(_Database.CreateParameter("RegionUUID", regionID));
                     conn.Open();
                     cmd.ExecuteNonQuery();
+
+                    _Log.InfoFormat("{0} Deleted terrain revision id = {1}", LogHeader, regionID);
                 }
             }
+
             int terrainDBRevision;
             Array terrainDBblob;
             terrData.GetDatabaseBlob(out terrainDBRevision, out terrainDBblob);
@@ -605,10 +610,12 @@ namespace OpenSim.Data.PGSQL
                     cmd.Parameters.Add(_Database.CreateParameter("Heightfield", terrainDBblob));
                     conn.Open();
                     cmd.ExecuteNonQuery();
+
+                    _Log.InfoFormat("{0} Stored terrain id = {1}, terrainSize = <{2},{3}>",
+                                    LogHeader, regionID, terrData.SizeX, terrData.SizeY);
                 }
             }
 
-            _Log.Info("[REGION DB]: Stored terrain revision r " + terrainDBRevision);
         }
 
         /// <summary>
@@ -1361,32 +1368,6 @@ namespace OpenSim.Data.PGSQL
 
         #region Private Methods
 
-        /*
-        /// <summary>
-        /// Serializes the terrain data for storage in DB.
-        /// </summary>
-        /// <param name="val">terrain data</param>
-        /// <returns></returns>
-        private static Array serializeTerrain(double[,] val)
-        {
-            MemoryStream str = new MemoryStream(((int)Constants.RegionSize * (int)Constants.RegionSize) * sizeof(double));
-            BinaryWriter bw = new BinaryWriter(str);
-
-            // TODO: COMPATIBILITY - Add byte-order conversions
-            for (int x = 0; x < (int)Constants.RegionSize; x++)
-                for (int y = 0; y < (int)Constants.RegionSize; y++)
-                {
-                    double height = val[x, y];
-                    if (height == 0.0)
-                        height = double.Epsilon;
-
-                    bw.Write(height);
-                }
-
-            return str.ToArray();
-        }
-        */
-
         /// <summary>
         /// Stores new regionsettings.
         /// </summary>
@@ -2246,11 +2227,6 @@ namespace OpenSim.Data.PGSQL
             }
         }
 
-        public UUID[] GetObjectIDs(UUID regionID)
-        {
-            return new UUID[0];
-        }
-
         public void SaveExtra(UUID regionID, string name, string value)
         {
         }