diff options
author | Melanie | 2012-01-30 16:22:21 +0000 |
---|---|---|
committer | Melanie | 2012-01-30 16:22:21 +0000 |
commit | 3de534896efe4014f50b03624d3b9db82cd92cae (patch) | |
tree | ff35c3deffdc26b10f34716651b9a9f365cc1b5e /OpenSim/Data | |
parent | Fix llEdgeOfWorld functionality - see mantis http://opensimulator.org/mantis/... (diff) | |
download | opensim-SC_OLD-3de534896efe4014f50b03624d3b9db82cd92cae.zip opensim-SC_OLD-3de534896efe4014f50b03624d3b9db82cd92cae.tar.gz opensim-SC_OLD-3de534896efe4014f50b03624d3b9db82cd92cae.tar.bz2 opensim-SC_OLD-3de534896efe4014f50b03624d3b9db82cd92cae.tar.xz |
Add ParcelImageID to RegionSettings so we can have that overlay.
Warning: Contains a Migration.
Warning: May contain nuts.
Diffstat (limited to 'OpenSim/Data')
-rw-r--r-- | OpenSim/Data/MySQL/MySQLSimulationData.cs | 6 | ||||
-rw-r--r-- | OpenSim/Data/MySQL/Resources/RegionStore.migrations | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/OpenSim/Data/MySQL/MySQLSimulationData.cs b/OpenSim/Data/MySQL/MySQLSimulationData.cs index 31d17f1..3123edf 100644 --- a/OpenSim/Data/MySQL/MySQLSimulationData.cs +++ b/OpenSim/Data/MySQL/MySQLSimulationData.cs | |||
@@ -997,7 +997,7 @@ namespace OpenSim.Data.MySQL | |||
997 | "covenant, Sandbox, sunvectorx, sunvectory, " + | 997 | "covenant, 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) " + | 1000 | "TelehubObject, parcel_tile_ID) " + |
1001 | "values (?RegionUUID, ?BlockTerraform, " + | 1001 | "values (?RegionUUID, ?BlockTerraform, " + |
1002 | "?BlockFly, ?AllowDamage, ?RestrictPushing, " + | 1002 | "?BlockFly, ?AllowDamage, ?RestrictPushing, " + |
1003 | "?AllowLandResell, ?AllowLandJoinDivide, " + | 1003 | "?AllowLandResell, ?AllowLandJoinDivide, " + |
@@ -1013,7 +1013,7 @@ namespace OpenSim.Data.MySQL | |||
1013 | "?SunPosition, ?Covenant, ?Sandbox, " + | 1013 | "?SunPosition, ?Covenant, ?Sandbox, " + |
1014 | "?SunVectorX, ?SunVectorY, ?SunVectorZ, " + | 1014 | "?SunVectorX, ?SunVectorY, ?SunVectorZ, " + |
1015 | "?LoadedCreationDateTime, ?LoadedCreationID, " + | 1015 | "?LoadedCreationDateTime, ?LoadedCreationID, " + |
1016 | "?TerrainImageID, ?TelehubObject) "; | 1016 | "?TerrainImageID, ?TelehubObject, ?ParcelImageID) "; |
1017 | 1017 | ||
1018 | FillRegionSettingsCommand(cmd, rs); | 1018 | FillRegionSettingsCommand(cmd, rs); |
1019 | 1019 | ||
@@ -1301,6 +1301,7 @@ namespace OpenSim.Data.MySQL | |||
1301 | newSettings.LoadedCreationID = (String) row["loaded_creation_id"]; | 1301 | newSettings.LoadedCreationID = (String) row["loaded_creation_id"]; |
1302 | 1302 | ||
1303 | newSettings.TerrainImageID = DBGuid.FromDB(row["map_tile_ID"]); | 1303 | newSettings.TerrainImageID = DBGuid.FromDB(row["map_tile_ID"]); |
1304 | newSettings.ParcelImageID = DBGuid.FromDB(row["parcel_tile_ID"]); | ||
1304 | newSettings.TelehubObject = DBGuid.FromDB(row["TelehubObject"]); | 1305 | newSettings.TelehubObject = DBGuid.FromDB(row["TelehubObject"]); |
1305 | 1306 | ||
1306 | return newSettings; | 1307 | return newSettings; |
@@ -1632,6 +1633,7 @@ namespace OpenSim.Data.MySQL | |||
1632 | cmd.Parameters.AddWithValue("LoadedCreationDateTime", settings.LoadedCreationDateTime); | 1633 | cmd.Parameters.AddWithValue("LoadedCreationDateTime", settings.LoadedCreationDateTime); |
1633 | cmd.Parameters.AddWithValue("LoadedCreationID", settings.LoadedCreationID); | 1634 | cmd.Parameters.AddWithValue("LoadedCreationID", settings.LoadedCreationID); |
1634 | cmd.Parameters.AddWithValue("TerrainImageID", settings.TerrainImageID); | 1635 | cmd.Parameters.AddWithValue("TerrainImageID", settings.TerrainImageID); |
1636 | cmd.Parameters.AddWithValue("ParcelImageID", settings.ParcelImageID); | ||
1635 | cmd.Parameters.AddWithValue("TelehubObject", settings.TelehubObject); | 1637 | cmd.Parameters.AddWithValue("TelehubObject", settings.TelehubObject); |
1636 | } | 1638 | } |
1637 | 1639 | ||
diff --git a/OpenSim/Data/MySQL/Resources/RegionStore.migrations b/OpenSim/Data/MySQL/Resources/RegionStore.migrations index 720e200..f9b5737 100644 --- a/OpenSim/Data/MySQL/Resources/RegionStore.migrations +++ b/OpenSim/Data/MySQL/Resources/RegionStore.migrations | |||
@@ -857,3 +857,9 @@ CREATE TABLE IF NOT EXISTS `spawn_points` ( | |||
857 | ALTER TABLE `regionsettings` ADD COLUMN `TelehubObject` varchar(36) NOT NULL; | 857 | ALTER TABLE `regionsettings` ADD COLUMN `TelehubObject` varchar(36) NOT NULL; |
858 | COMMIT; | 858 | COMMIT; |
859 | 859 | ||
860 | :VERSION 40 #---------------- Parcels for sale | ||
861 | |||
862 | BEGIN; | ||
863 | ALTER TABLE `regionsettings` ADD COLUMN `parcel_tile_ID` char(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000'; | ||
864 | COMMIT; | ||
865 | |||