From efe3f3eb2a0a31b1da474974c7d8193c2b28e13f Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Sat, 18 Oct 2008 05:51:36 +0000
Subject: Megapatch. :) Fix skull attachment editing. Streamline Object terse
 updates. Add rezzing time to objects. Add Object return and traffic fields to
 land database. Add plumbing for auto return. Implement auto return. Contains
 a migration. May contain nuts.

---
 OpenSim/Data/SQLite/Resources/013_RegionStore.sql | 6 ++++++
 OpenSim/Data/SQLite/SQLiteRegionData.cs           | 7 +++++++
 2 files changed, 13 insertions(+)
 create mode 100644 OpenSim/Data/SQLite/Resources/013_RegionStore.sql

(limited to 'OpenSim/Data/SQLite')

diff --git a/OpenSim/Data/SQLite/Resources/013_RegionStore.sql b/OpenSim/Data/SQLite/Resources/013_RegionStore.sql
new file mode 100644
index 0000000..11529cd
--- /dev/null
+++ b/OpenSim/Data/SQLite/Resources/013_RegionStore.sql
@@ -0,0 +1,6 @@
+BEGIN;
+
+ALTER TABLE land ADD COLUMN OtherCleanTime INTEGER NOT NULL default 0;
+ALTER TABLE land ADD COLUMN Dwell INTEGER NOT NULL default 0;
+
+COMMIT;
diff --git a/OpenSim/Data/SQLite/SQLiteRegionData.cs b/OpenSim/Data/SQLite/SQLiteRegionData.cs
index c87d2e3..812367d 100644
--- a/OpenSim/Data/SQLite/SQLiteRegionData.cs
+++ b/OpenSim/Data/SQLite/SQLiteRegionData.cs
@@ -992,6 +992,8 @@ namespace OpenSim.Data.SQLite
             createCol(land, "UserLookAtY", typeof (Double));
             createCol(land, "UserLookAtZ", typeof (Double));
             createCol(land, "AuthbuyerID", typeof(String));
+            createCol(land, "OtherCleanTime", typeof(Int32));
+            createCol(land, "Dwell", typeof(Int32));
 
             land.PrimaryKey = new DataColumn[] {land.Columns["UUID"]};
 
@@ -1315,6 +1317,9 @@ namespace OpenSim.Data.SQLite
 
             UUID.TryParse((string)row["AuthbuyerID"], out authBuyerID);
 
+            newData.OtherCleanTime = Convert.ToInt32(row["OtherCleanTime"]);
+            newData.Dwell = Convert.ToInt32(row["Dwell"]);
+
             return newData;
         }
 
@@ -1611,6 +1616,8 @@ namespace OpenSim.Data.SQLite
             row["UserLookAtY"] = land.UserLookAt.Y;
             row["UserLookAtZ"] = land.UserLookAt.Z;
             row["AuthbuyerID"] = Util.ToRawUuidString(land.AuthBuyerID);
+            row["OtherCleanTime"] = land.OtherCleanTime;
+            row["Dwell"] = land.Dwell;
         }
 
         /// <summary>
-- 
cgit v1.1