diff options
author | BlueWall | 2012-02-17 20:04:38 -0500 |
---|---|---|
committer | BlueWall | 2012-02-19 12:41:11 -0500 |
commit | b19933068277251c214cda85627de635e85bd0b5 (patch) | |
tree | 9074b2b63586efa177539502bc40120f0d02b865 | |
parent | Fillin missing SQLite support for Telehubs (diff) | |
download | opensim-SC_OLD-b19933068277251c214cda85627de635e85bd0b5.zip opensim-SC_OLD-b19933068277251c214cda85627de635e85bd0b5.tar.gz opensim-SC_OLD-b19933068277251c214cda85627de635e85bd0b5.tar.bz2 opensim-SC_OLD-b19933068277251c214cda85627de635e85bd0b5.tar.xz |
Parcel sales support to SQLite
-rw-r--r-- | OpenSim/Data/SQLite/Resources/RegionStore.migrations | 8 | ||||
-rw-r--r-- | OpenSim/Data/SQLite/SQLiteSimulationData.cs | 3 |
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` ( | |||
557 | 557 | ||
558 | ALTER TABLE `regionsettings` ADD COLUMN `TelehubObject` varchar(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000'; | 558 | ALTER TABLE `regionsettings` ADD COLUMN `TelehubObject` varchar(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000'; |
559 | 559 | ||
560 | COMMIT; \ No newline at end of file | 560 | COMMIT; |
561 | |||
562 | :VERSION 25 | ||
563 | |||
564 | BEGIN; | ||
565 | ALTER TABLE `regionsettings` ADD COLUMN `parcel_tile_ID` char(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000'; | ||
566 | 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 | |||
1346 | createCol(regionsettings, "covenant_datetime", typeof(Int32)); | 1346 | createCol(regionsettings, "covenant_datetime", typeof(Int32)); |
1347 | createCol(regionsettings, "map_tile_ID", typeof(String)); | 1347 | createCol(regionsettings, "map_tile_ID", typeof(String)); |
1348 | createCol(regionsettings, "TelehubObject", typeof(String)); | 1348 | createCol(regionsettings, "TelehubObject", typeof(String)); |
1349 | createCol(regionsettings, "parcel_tile_ID", typeof(String)); | ||
1349 | regionsettings.PrimaryKey = new DataColumn[] { regionsettings.Columns["regionUUID"] }; | 1350 | regionsettings.PrimaryKey = new DataColumn[] { regionsettings.Columns["regionUUID"] }; |
1350 | return regionsettings; | 1351 | return regionsettings; |
1351 | } | 1352 | } |
@@ -1759,6 +1760,7 @@ namespace OpenSim.Data.SQLite | |||
1759 | newSettings.CovenantChangedDateTime = Convert.ToInt32(row["covenant_datetime"]); | 1760 | newSettings.CovenantChangedDateTime = Convert.ToInt32(row["covenant_datetime"]); |
1760 | newSettings.TerrainImageID = new UUID((String)row["map_tile_ID"]); | 1761 | newSettings.TerrainImageID = new UUID((String)row["map_tile_ID"]); |
1761 | newSettings.TelehubObject = new UUID((String)row["TelehubObject"]); | 1762 | newSettings.TelehubObject = new UUID((String)row["TelehubObject"]); |
1763 | newSettings.ParcelImageID = new UUID((String)row["parcel_tile_ID"]); | ||
1762 | 1764 | ||
1763 | return newSettings; | 1765 | return newSettings; |
1764 | } | 1766 | } |
@@ -2162,6 +2164,7 @@ namespace OpenSim.Data.SQLite | |||
2162 | row["covenant_datetime"] = settings.CovenantChangedDateTime; | 2164 | row["covenant_datetime"] = settings.CovenantChangedDateTime; |
2163 | row["map_tile_ID"] = settings.TerrainImageID.ToString(); | 2165 | row["map_tile_ID"] = settings.TerrainImageID.ToString(); |
2164 | row["TelehubObject"] = settings.TelehubObject.ToString(); | 2166 | row["TelehubObject"] = settings.TelehubObject.ToString(); |
2167 | row["parcel_tile_ID"] = settings.ParcelImageID.ToString(); | ||
2165 | } | 2168 | } |
2166 | 2169 | ||
2167 | /// <summary> | 2170 | /// <summary> |