diff options
author | Dan Lake | 2012-02-03 15:21:37 -0800 |
---|---|---|
committer | Dan Lake | 2012-02-03 15:21:37 -0800 |
commit | 4f8f44d9c3f42fbd841264fbede3e10ca253d016 (patch) | |
tree | e6e26d76ef58c9422a6cf030580c1f7377d7d931 /OpenSim/Data/SQLite | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
parent | Merge branch 'master' of /home/opensim/src/opensim (diff) | |
download | opensim-SC_OLD-4f8f44d9c3f42fbd841264fbede3e10ca253d016.zip opensim-SC_OLD-4f8f44d9c3f42fbd841264fbede3e10ca253d016.tar.gz opensim-SC_OLD-4f8f44d9c3f42fbd841264fbede3e10ca253d016.tar.bz2 opensim-SC_OLD-4f8f44d9c3f42fbd841264fbede3e10ca253d016.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Data/SQLite')
-rw-r--r-- | OpenSim/Data/SQLite/Resources/RegionStore.migrations | 7 | ||||
-rw-r--r-- | OpenSim/Data/SQLite/SQLiteSimulationData.cs | 3 |
2 files changed, 9 insertions, 1 deletions
diff --git a/OpenSim/Data/SQLite/Resources/RegionStore.migrations b/OpenSim/Data/SQLite/Resources/RegionStore.migrations index 5e2045b..31195af 100644 --- a/OpenSim/Data/SQLite/Resources/RegionStore.migrations +++ b/OpenSim/Data/SQLite/Resources/RegionStore.migrations | |||
@@ -466,4 +466,9 @@ ALTER TABLE `land` ADD COLUMN `MediaSize` VARCHAR(16) NOT NULL DEFAULT '0,0'; | |||
466 | ALTER TABLE `land` ADD COLUMN `MediaLoop` BOOLEAN NOT NULL DEFAULT FALSE; | 466 | ALTER TABLE `land` ADD COLUMN `MediaLoop` BOOLEAN NOT NULL DEFAULT FALSE; |
467 | ALTER TABLE `land` ADD COLUMN `ObscureMusic` BOOLEAN NOT NULL DEFAULT FALSE; | 467 | ALTER TABLE `land` ADD COLUMN `ObscureMusic` BOOLEAN NOT NULL DEFAULT FALSE; |
468 | ALTER TABLE `land` ADD COLUMN `ObscureMedia` BOOLEAN NOT NULL DEFAULT FALSE; | 468 | ALTER TABLE `land` ADD COLUMN `ObscureMedia` BOOLEAN NOT NULL DEFAULT FALSE; |
469 | COMMIT; \ No newline at end of file | 469 | COMMIT; |
470 | |||
471 | :VERSION 22 | ||
472 | BEGIN; | ||
473 | ALTER TABLE regionsettings ADD COLUMN covenant_datetime INTEGER NOT NULL default 0; | ||
474 | COMMIT; | ||
diff --git a/OpenSim/Data/SQLite/SQLiteSimulationData.cs b/OpenSim/Data/SQLite/SQLiteSimulationData.cs index 2d06f82..a313c4f 100644 --- a/OpenSim/Data/SQLite/SQLiteSimulationData.cs +++ b/OpenSim/Data/SQLite/SQLiteSimulationData.cs | |||
@@ -1185,6 +1185,7 @@ namespace OpenSim.Data.SQLite | |||
1185 | createCol(regionsettings, "fixed_sun", typeof (Int32)); | 1185 | createCol(regionsettings, "fixed_sun", typeof (Int32)); |
1186 | createCol(regionsettings, "sun_position", typeof (Double)); | 1186 | createCol(regionsettings, "sun_position", typeof (Double)); |
1187 | createCol(regionsettings, "covenant", typeof(String)); | 1187 | createCol(regionsettings, "covenant", typeof(String)); |
1188 | createCol(regionsettings, "covenant_datetime", typeof(Int32)); | ||
1188 | createCol(regionsettings, "map_tile_ID", typeof(String)); | 1189 | createCol(regionsettings, "map_tile_ID", typeof(String)); |
1189 | regionsettings.PrimaryKey = new DataColumn[] { regionsettings.Columns["regionUUID"] }; | 1190 | regionsettings.PrimaryKey = new DataColumn[] { regionsettings.Columns["regionUUID"] }; |
1190 | return regionsettings; | 1191 | return regionsettings; |
@@ -1509,6 +1510,7 @@ namespace OpenSim.Data.SQLite | |||
1509 | newSettings.FixedSun = Convert.ToBoolean(row["fixed_sun"]); | 1510 | newSettings.FixedSun = Convert.ToBoolean(row["fixed_sun"]); |
1510 | newSettings.SunPosition = Convert.ToDouble(row["sun_position"]); | 1511 | newSettings.SunPosition = Convert.ToDouble(row["sun_position"]); |
1511 | newSettings.Covenant = new UUID((String) row["covenant"]); | 1512 | newSettings.Covenant = new UUID((String) row["covenant"]); |
1513 | newSettings.CovenantChangedDateTime = Convert.ToInt32(row["covenant_datetime"]); | ||
1512 | newSettings.TerrainImageID = new UUID((String)row["map_tile_ID"]); | 1514 | newSettings.TerrainImageID = new UUID((String)row["map_tile_ID"]); |
1513 | 1515 | ||
1514 | return newSettings; | 1516 | return newSettings; |
@@ -1833,6 +1835,7 @@ namespace OpenSim.Data.SQLite | |||
1833 | row["fixed_sun"] = settings.FixedSun; | 1835 | row["fixed_sun"] = settings.FixedSun; |
1834 | row["sun_position"] = settings.SunPosition; | 1836 | row["sun_position"] = settings.SunPosition; |
1835 | row["covenant"] = settings.Covenant.ToString(); | 1837 | row["covenant"] = settings.Covenant.ToString(); |
1838 | row["covenant_datetime"] = settings.CovenantChangedDateTime; | ||
1836 | row["map_tile_ID"] = settings.TerrainImageID.ToString(); | 1839 | row["map_tile_ID"] = settings.TerrainImageID.ToString(); |
1837 | } | 1840 | } |
1838 | 1841 | ||