aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data
diff options
context:
space:
mode:
authorMelanie2012-01-30 16:38:11 +0000
committerMelanie2012-01-30 16:38:11 +0000
commit1b600e7803a317e722b172c2a3481fc4d24ddc6c (patch)
tree227712e3dd9df46b82edaf3e325af4c0a1ca9763 /OpenSim/Data
parentMerge branch 'master' into careminster (diff)
parentAdd ParcelImageID to RegionSettings so we can have that overlay. (diff)
downloadopensim-SC_OLD-1b600e7803a317e722b172c2a3481fc4d24ddc6c.zip
opensim-SC_OLD-1b600e7803a317e722b172c2a3481fc4d24ddc6c.tar.gz
opensim-SC_OLD-1b600e7803a317e722b172c2a3481fc4d24ddc6c.tar.bz2
opensim-SC_OLD-1b600e7803a317e722b172c2a3481fc4d24ddc6c.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs
Diffstat (limited to 'OpenSim/Data')
-rw-r--r--OpenSim/Data/MySQL/MySQLSimulationData.cs6
-rw-r--r--OpenSim/Data/MySQL/Resources/RegionStore.migrations6
2 files changed, 10 insertions, 2 deletions
diff --git a/OpenSim/Data/MySQL/MySQLSimulationData.cs b/OpenSim/Data/MySQL/MySQLSimulationData.cs
index e07d94b..d459e08 100644
--- a/OpenSim/Data/MySQL/MySQLSimulationData.cs
+++ b/OpenSim/Data/MySQL/MySQLSimulationData.cs
@@ -1012,7 +1012,7 @@ namespace OpenSim.Data.MySQL
1012 "covenant, Sandbox, sunvectorx, sunvectory, " + 1012 "covenant, Sandbox, sunvectorx, sunvectory, " +
1013 "sunvectorz, loaded_creation_datetime, " + 1013 "sunvectorz, loaded_creation_datetime, " +
1014 "loaded_creation_id, map_tile_ID, block_search, casino, " + 1014 "loaded_creation_id, map_tile_ID, block_search, casino, " +
1015 "TelehubObject) " + 1015 "TelehubObject, parcel_tile_ID) " +
1016 "values (?RegionUUID, ?BlockTerraform, " + 1016 "values (?RegionUUID, ?BlockTerraform, " +
1017 "?BlockFly, ?AllowDamage, ?RestrictPushing, " + 1017 "?BlockFly, ?AllowDamage, ?RestrictPushing, " +
1018 "?AllowLandResell, ?AllowLandJoinDivide, " + 1018 "?AllowLandResell, ?AllowLandJoinDivide, " +
@@ -1029,7 +1029,7 @@ namespace OpenSim.Data.MySQL
1029 "?SunVectorX, ?SunVectorY, ?SunVectorZ, " + 1029 "?SunVectorX, ?SunVectorY, ?SunVectorZ, " +
1030 "?LoadedCreationDateTime, ?LoadedCreationID, " + 1030 "?LoadedCreationDateTime, ?LoadedCreationID, " +
1031 "?TerrainImageID, ?block_search, ?casino, " + 1031 "?TerrainImageID, ?block_search, ?casino, " +
1032 "?TelehubObject)"; 1032 "?TelehubObject, ?ParcelImageID)";
1033 1033
1034 FillRegionSettingsCommand(cmd, rs); 1034 FillRegionSettingsCommand(cmd, rs);
1035 1035
@@ -1317,6 +1317,7 @@ namespace OpenSim.Data.MySQL
1317 newSettings.LoadedCreationID = (String) row["loaded_creation_id"]; 1317 newSettings.LoadedCreationID = (String) row["loaded_creation_id"];
1318 1318
1319 newSettings.TerrainImageID = DBGuid.FromDB(row["map_tile_ID"]); 1319 newSettings.TerrainImageID = DBGuid.FromDB(row["map_tile_ID"]);
1320 newSettings.ParcelImageID = DBGuid.FromDB(row["parcel_tile_ID"]);
1320 newSettings.TelehubObject = DBGuid.FromDB(row["TelehubObject"]); 1321 newSettings.TelehubObject = DBGuid.FromDB(row["TelehubObject"]);
1321 1322
1322 newSettings.GodBlockSearch = Convert.ToBoolean(row["block_search"]); 1323 newSettings.GodBlockSearch = Convert.ToBoolean(row["block_search"]);
@@ -1658,6 +1659,7 @@ namespace OpenSim.Data.MySQL
1658 cmd.Parameters.AddWithValue("block_search", settings.GodBlockSearch); 1659 cmd.Parameters.AddWithValue("block_search", settings.GodBlockSearch);
1659 cmd.Parameters.AddWithValue("casino", settings.Casino); 1660 cmd.Parameters.AddWithValue("casino", settings.Casino);
1660 1661
1662 cmd.Parameters.AddWithValue("ParcelImageID", settings.ParcelImageID);
1661 cmd.Parameters.AddWithValue("TelehubObject", settings.TelehubObject); 1663 cmd.Parameters.AddWithValue("TelehubObject", settings.TelehubObject);
1662 } 1664 }
1663 1665
diff --git a/OpenSim/Data/MySQL/Resources/RegionStore.migrations b/OpenSim/Data/MySQL/Resources/RegionStore.migrations
index 219de62..dae704c 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` (
857ALTER TABLE `regionsettings` ADD COLUMN `TelehubObject` varchar(36) NOT NULL; 857ALTER TABLE `regionsettings` ADD COLUMN `TelehubObject` varchar(36) NOT NULL;
858COMMIT; 858COMMIT;
859 859
860:VERSION 40 #---------------- Parcels for sale
861
862BEGIN;
863ALTER TABLE `regionsettings` ADD COLUMN `parcel_tile_ID` char(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000';
864COMMIT;
865