diff options
author | PixelTomsen | 2012-02-03 22:02:36 +0100 |
---|---|---|
committer | BlueWall | 2012-02-03 18:02:51 -0500 |
commit | 5c545d1d2e0a1862d063a1bdf80d2cd2fa311101 (patch) | |
tree | ddad500270bdd994d9852c657b0d2bf76ce7f7ac /OpenSim/Data/SQLite/SQLiteSimulationData.cs | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC_OLD-5c545d1d2e0a1862d063a1bdf80d2cd2fa311101.zip opensim-SC_OLD-5c545d1d2e0a1862d063a1bdf80d2cd2fa311101.tar.gz opensim-SC_OLD-5c545d1d2e0a1862d063a1bdf80d2cd2fa311101.tar.bz2 opensim-SC_OLD-5c545d1d2e0a1862d063a1bdf80d2cd2fa311101.tar.xz |
Fix: Covenant changed time not set http://opensimulator.org/mantis/view.php?id=5869
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Data/SQLite/SQLiteSimulationData.cs | 3 |
1 files changed, 3 insertions, 0 deletions
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 | ||