Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

2 files changed, 10 insertions, 1 deletions

diff --git a/OpenSim/Data/SQLite/Resources/RegionStore.migrations b/OpenSim/Data/SQLite/Resources/RegionStore.migrations
index a00a8fb..1ceddf9 100644
--- a/OpenSim/Data/SQLite/Resources/RegionStore.migrations
+++ b/OpenSim/Data/SQLite/Resources/RegionStore.migrations
@@ -557,4 +557,10 @@ CREATE TABLE IF NOT EXISTS `spawn_points` (
 
 ALTER TABLE `regionsettings` ADD COLUMN `TelehubObject` varchar(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000';
 
-COMMIT;
\ No newline at end of file
+COMMIT;
+
+:VERSION 25
+
+BEGIN;
+ALTER TABLE `regionsettings` ADD COLUMN `parcel_tile_ID` char(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000';
+COMMIT;
diff --git a/OpenSim/Data/SQLite/SQLiteSimulationData.cs b/OpenSim/Data/SQLite/SQLiteSimulationData.cs
index 83f803b..6295113 100644
--- a/OpenSim/Data/SQLite/SQLiteSimulationData.cs
+++ b/OpenSim/Data/SQLite/SQLiteSimulationData.cs
@@ -1346,6 +1346,7 @@ namespace OpenSim.Data.SQLite
             createCol(regionsettings, "covenant_datetime", typeof(Int32));
             createCol(regionsettings, "map_tile_ID", typeof(String));
             createCol(regionsettings, "TelehubObject", typeof(String));
+            createCol(regionsettings, "parcel_tile_ID", typeof(String));
             regionsettings.PrimaryKey = new DataColumn[] { regionsettings.Columns["regionUUID"] };
             return regionsettings;
         }
@@ -1759,6 +1760,7 @@ namespace OpenSim.Data.SQLite
             newSettings.CovenantChangedDateTime = Convert.ToInt32(row["covenant_datetime"]);
             newSettings.TerrainImageID = new UUID((String)row["map_tile_ID"]);
             newSettings.TelehubObject = new UUID((String)row["TelehubObject"]);
+            newSettings.ParcelImageID = new UUID((String)row["parcel_tile_ID"]);
 
             return newSettings;
         }
@@ -2162,6 +2164,7 @@ namespace OpenSim.Data.SQLite
             row["covenant_datetime"] = settings.CovenantChangedDateTime;
             row["map_tile_ID"] = settings.TerrainImageID.ToString();
             row["TelehubObject"] = settings.TelehubObject.ToString();
+            row["parcel_tile_ID"] = settings.ParcelImageID.ToString();
         }
 
         /// <summary>