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/MySQL/MySQLSimulationData.cs | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC-5c545d1d2e0a1862d063a1bdf80d2cd2fa311101.zip opensim-SC-5c545d1d2e0a1862d063a1bdf80d2cd2fa311101.tar.gz opensim-SC-5c545d1d2e0a1862d063a1bdf80d2cd2fa311101.tar.bz2 opensim-SC-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 'OpenSim/Data/MySQL/MySQLSimulationData.cs')
-rw-r--r-- | OpenSim/Data/MySQL/MySQLSimulationData.cs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/OpenSim/Data/MySQL/MySQLSimulationData.cs b/OpenSim/Data/MySQL/MySQLSimulationData.cs index 3275146..7c995ad 100644 --- a/OpenSim/Data/MySQL/MySQLSimulationData.cs +++ b/OpenSim/Data/MySQL/MySQLSimulationData.cs | |||
@@ -994,7 +994,7 @@ namespace OpenSim.Data.MySQL | |||
994 | "elevation_2_sw, water_height, " + | 994 | "elevation_2_sw, water_height, " + |
995 | "terrain_raise_limit, terrain_lower_limit, " + | 995 | "terrain_raise_limit, terrain_lower_limit, " + |
996 | "use_estate_sun, fixed_sun, sun_position, " + | 996 | "use_estate_sun, fixed_sun, sun_position, " + |
997 | "covenant, Sandbox, sunvectorx, sunvectory, " + | 997 | "covenant, covenant_datetime, Sandbox, sunvectorx, sunvectory, " + |
998 | "sunvectorz, loaded_creation_datetime, " + | 998 | "sunvectorz, loaded_creation_datetime, " + |
999 | "loaded_creation_id, map_tile_ID, " + | 999 | "loaded_creation_id, map_tile_ID, " + |
1000 | "TelehubObject, parcel_tile_ID) " + | 1000 | "TelehubObject, parcel_tile_ID) " + |
@@ -1010,7 +1010,7 @@ namespace OpenSim.Data.MySQL | |||
1010 | "?Elevation2SE, ?Elevation1SW, ?Elevation2SW, " + | 1010 | "?Elevation2SE, ?Elevation1SW, ?Elevation2SW, " + |
1011 | "?WaterHeight, ?TerrainRaiseLimit, " + | 1011 | "?WaterHeight, ?TerrainRaiseLimit, " + |
1012 | "?TerrainLowerLimit, ?UseEstateSun, ?FixedSun, " + | 1012 | "?TerrainLowerLimit, ?UseEstateSun, ?FixedSun, " + |
1013 | "?SunPosition, ?Covenant, ?Sandbox, " + | 1013 | "?SunPosition, ?Covenant, ?CovenantChangedDateTime, ?Sandbox, " + |
1014 | "?SunVectorX, ?SunVectorY, ?SunVectorZ, " + | 1014 | "?SunVectorX, ?SunVectorY, ?SunVectorZ, " + |
1015 | "?LoadedCreationDateTime, ?LoadedCreationID, " + | 1015 | "?LoadedCreationDateTime, ?LoadedCreationID, " + |
1016 | "?TerrainImageID, ?TelehubObject, ?ParcelImageID) "; | 1016 | "?TerrainImageID, ?TelehubObject, ?ParcelImageID) "; |
@@ -1292,7 +1292,7 @@ namespace OpenSim.Data.MySQL | |||
1292 | newSettings.FixedSun = Convert.ToBoolean(row["fixed_sun"]); | 1292 | newSettings.FixedSun = Convert.ToBoolean(row["fixed_sun"]); |
1293 | newSettings.SunPosition = Convert.ToDouble(row["sun_position"]); | 1293 | newSettings.SunPosition = Convert.ToDouble(row["sun_position"]); |
1294 | newSettings.Covenant = DBGuid.FromDB(row["covenant"]); | 1294 | newSettings.Covenant = DBGuid.FromDB(row["covenant"]); |
1295 | 1295 | newSettings.CovenantChangedDateTime = Convert.ToInt32(row["covenant_datetime"]); | |
1296 | newSettings.LoadedCreationDateTime = Convert.ToInt32(row["loaded_creation_datetime"]); | 1296 | newSettings.LoadedCreationDateTime = Convert.ToInt32(row["loaded_creation_datetime"]); |
1297 | 1297 | ||
1298 | if (row["loaded_creation_id"] is DBNull) | 1298 | if (row["loaded_creation_id"] is DBNull) |
@@ -1630,6 +1630,7 @@ namespace OpenSim.Data.MySQL | |||
1630 | cmd.Parameters.AddWithValue("FixedSun", settings.FixedSun); | 1630 | cmd.Parameters.AddWithValue("FixedSun", settings.FixedSun); |
1631 | cmd.Parameters.AddWithValue("SunPosition", settings.SunPosition); | 1631 | cmd.Parameters.AddWithValue("SunPosition", settings.SunPosition); |
1632 | cmd.Parameters.AddWithValue("Covenant", settings.Covenant.ToString()); | 1632 | cmd.Parameters.AddWithValue("Covenant", settings.Covenant.ToString()); |
1633 | cmd.Parameters.AddWithValue("CovenantChangedDateTime", settings.CovenantChangedDateTime); | ||
1633 | cmd.Parameters.AddWithValue("LoadedCreationDateTime", settings.LoadedCreationDateTime); | 1634 | cmd.Parameters.AddWithValue("LoadedCreationDateTime", settings.LoadedCreationDateTime); |
1634 | cmd.Parameters.AddWithValue("LoadedCreationID", settings.LoadedCreationID); | 1635 | cmd.Parameters.AddWithValue("LoadedCreationID", settings.LoadedCreationID); |
1635 | cmd.Parameters.AddWithValue("TerrainImageID", settings.TerrainImageID); | 1636 | cmd.Parameters.AddWithValue("TerrainImageID", settings.TerrainImageID); |