2 files changed, 16 insertions, 16 deletions

diff --git a/OpenSim/Data/SQLite/SQLiteRegionData.cs b/OpenSim/Data/SQLite/SQLiteRegionData.cs
index 41d108e..fef5e3b 100644
--- a/OpenSim/Data/SQLite/SQLiteRegionData.cs
+++ b/OpenSim/Data/SQLite/SQLiteRegionData.cs
@@ -470,20 +470,6 @@ namespace OpenSim.Data.SQLite
             {
                 int revision = Util.UnixTimeSinceEpoch();
 
-                // the following is an work around for .NET.  The perf
-                // issues associated with it aren't as bad as you think.
-                m_log.Info("[REGION DB]: Storing terrain revision r" + revision.ToString());
-                String sql = "insert into terrain(RegionUUID, Revision, Heightfield)" +
-                             " values(:RegionUUID, :Revision, :Heightfield)";
-
-                using (SqliteCommand cmd = new SqliteCommand(sql, m_conn))
-                {
-                    cmd.Parameters.Add(new SqliteParameter(":RegionUUID", Util.ToRawUuidString(regionID)));
-                    cmd.Parameters.Add(new SqliteParameter(":Revision", revision));
-                    cmd.Parameters.Add(new SqliteParameter(":Heightfield", serializeTerrain(ter)));
-                    cmd.ExecuteNonQuery();
-                }
-
                 // This is added to get rid of the infinitely growing
                 // terrain databases which negatively impact on SQLite
                 // over time.  Before reenabling this feature there
@@ -493,13 +479,27 @@ namespace OpenSim.Data.SQLite
 
                 using (
                     SqliteCommand cmd =
-                        new SqliteCommand("delete from terrain where RegionUUID=:RegionUUID and Revision < :Revision",
+                        new SqliteCommand("delete from terrain where RegionUUID=:RegionUUID and Revision <= :Revision",
                                           m_conn))
                 {
                     cmd.Parameters.Add(new SqliteParameter(":RegionUUID", Util.ToRawUuidString(regionID)));
                     cmd.Parameters.Add(new SqliteParameter(":Revision", revision));
                     cmd.ExecuteNonQuery();
                 }
+
+                // the following is an work around for .NET.  The perf
+                // issues associated with it aren't as bad as you think.
+                m_log.Info("[REGION DB]: Storing terrain revision r" + revision.ToString());
+                String sql = "insert into terrain(RegionUUID, Revision, Heightfield)" +
+                             " values(:RegionUUID, :Revision, :Heightfield)";
+
+                using (SqliteCommand cmd = new SqliteCommand(sql, m_conn))
+                {
+                    cmd.Parameters.Add(new SqliteParameter(":RegionUUID", Util.ToRawUuidString(regionID)));
+                    cmd.Parameters.Add(new SqliteParameter(":Revision", revision));
+                    cmd.Parameters.Add(new SqliteParameter(":Heightfield", serializeTerrain(ter)));
+                    cmd.ExecuteNonQuery();
+                }
             }
         }
 
diff --git a/OpenSim/Data/SQLite/Tests/SQLiteRegionTest.cs b/OpenSim/Data/SQLite/Tests/SQLiteRegionTest.cs
index 94b5bf1..6727b87 100644
--- a/OpenSim/Data/SQLite/Tests/SQLiteRegionTest.cs
+++ b/OpenSim/Data/SQLite/Tests/SQLiteRegionTest.cs
@@ -55,7 +55,7 @@ namespace OpenSim.Data.SQLite.Tests
         [TestFixtureTearDown]
         public void Cleanup()
         {
-            System.IO.File.Delete(file);
+            // System.IO.File.Delete(file);
         }
     }
 }
\ No newline at end of file