aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Data/MySQL/MySQLSimulationData.cs9
-rw-r--r--OpenSim/Framework/RegionSettings.cs13
-rw-r--r--OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs4
-rw-r--r--OpenSim/Region/CoreModules/World/Land/LandObject.cs2
4 files changed, 25 insertions, 3 deletions
diff --git a/OpenSim/Data/MySQL/MySQLSimulationData.cs b/OpenSim/Data/MySQL/MySQLSimulationData.cs
index 3306968..0754ca8 100644
--- a/OpenSim/Data/MySQL/MySQLSimulationData.cs
+++ b/OpenSim/Data/MySQL/MySQLSimulationData.cs
@@ -1011,7 +1011,7 @@ namespace OpenSim.Data.MySQL
1011 "use_estate_sun, fixed_sun, sun_position, " + 1011 "use_estate_sun, fixed_sun, sun_position, " +
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) values (?RegionUUID, ?BlockTerraform, " + 1014 "loaded_creation_id, map_tile_ID, block_search, casino) values (?RegionUUID, ?BlockTerraform, " +
1015 "?BlockFly, ?AllowDamage, ?RestrictPushing, " + 1015 "?BlockFly, ?AllowDamage, ?RestrictPushing, " +
1016 "?AllowLandResell, ?AllowLandJoinDivide, " + 1016 "?AllowLandResell, ?AllowLandJoinDivide, " +
1017 "?BlockShowInSearch, ?AgentLimit, ?ObjectBonus, " + 1017 "?BlockShowInSearch, ?AgentLimit, ?ObjectBonus, " +
@@ -1026,7 +1026,7 @@ namespace OpenSim.Data.MySQL
1026 "?SunPosition, ?Covenant, ?Sandbox, " + 1026 "?SunPosition, ?Covenant, ?Sandbox, " +
1027 "?SunVectorX, ?SunVectorY, ?SunVectorZ, " + 1027 "?SunVectorX, ?SunVectorY, ?SunVectorZ, " +
1028 "?LoadedCreationDateTime, ?LoadedCreationID, " + 1028 "?LoadedCreationDateTime, ?LoadedCreationID, " +
1029 "?TerrainImageID)"; 1029 "?TerrainImageID, ?block_search, ?casino)";
1030 1030
1031 FillRegionSettingsCommand(cmd, rs); 1031 FillRegionSettingsCommand(cmd, rs);
1032 1032
@@ -1315,6 +1315,9 @@ namespace OpenSim.Data.MySQL
1315 1315
1316 newSettings.TerrainImageID = DBGuid.FromDB(row["map_tile_ID"]); 1316 newSettings.TerrainImageID = DBGuid.FromDB(row["map_tile_ID"]);
1317 1317
1318 newSettings.GodBlockSearch = Convert.ToBoolean(row["block_search"]);
1319 newSettings.Casino = Convert.ToBoolean(row["casino"]);
1320
1318 return newSettings; 1321 return newSettings;
1319 } 1322 }
1320 1323
@@ -1644,6 +1647,8 @@ namespace OpenSim.Data.MySQL
1644 cmd.Parameters.AddWithValue("LoadedCreationDateTime", settings.LoadedCreationDateTime); 1647 cmd.Parameters.AddWithValue("LoadedCreationDateTime", settings.LoadedCreationDateTime);
1645 cmd.Parameters.AddWithValue("LoadedCreationID", settings.LoadedCreationID); 1648 cmd.Parameters.AddWithValue("LoadedCreationID", settings.LoadedCreationID);
1646 cmd.Parameters.AddWithValue("TerrainImageID", settings.TerrainImageID); 1649 cmd.Parameters.AddWithValue("TerrainImageID", settings.TerrainImageID);
1650 cmd.Parameters.AddWithValue("block_search", settings.GodBlockSearch);
1651 cmd.Parameters.AddWithValue("casino", settings.Casino);
1647 1652
1648 } 1653 }
1649 1654
diff --git a/OpenSim/Framework/RegionSettings.cs b/OpenSim/Framework/RegionSettings.cs
index 673cf20..f0786fc 100644
--- a/OpenSim/Framework/RegionSettings.cs
+++ b/OpenSim/Framework/RegionSettings.cs
@@ -397,5 +397,18 @@ namespace OpenSim.Framework
397 set { m_LoadedCreationID = value; } 397 set { m_LoadedCreationID = value; }
398 } 398 }
399 399
400 private bool m_GodBlockSearch = false;
401 public bool GodBlockSearch
402 {
403 get { return m_GodBlockSearch; }
404 set { m_GodBlockSearch = value; }
405 }
406
407 private bool m_Casino = false;
408 public bool Casino
409 {
410 get { return m_Casino; }
411 set { m_Casino = value; }
412 }
400 } 413 }
401} 414}
diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
index bc76a7c..b96f300 100644
--- a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
@@ -1182,6 +1182,10 @@ namespace OpenSim.Region.CoreModules.World.Estate
1182 flags |= RegionFlags.AllowParcelChanges; 1182 flags |= RegionFlags.AllowParcelChanges;
1183 if (Scene.RegionInfo.RegionSettings.BlockShowInSearch) 1183 if (Scene.RegionInfo.RegionSettings.BlockShowInSearch)
1184 flags |= RegionFlags.BlockParcelSearch; 1184 flags |= RegionFlags.BlockParcelSearch;
1185 if (Scene.RegionInfo.RegionSettings.GodBlockSearch)
1186 flags |= (RegionFlags)(1 << 11);
1187 if (Scene.RegionInfo.RegionSettings.Casino)
1188 flags |= (RegionFlags)(1 << 10);
1185 1189
1186 if (Scene.RegionInfo.RegionSettings.FixedSun) 1190 if (Scene.RegionInfo.RegionSettings.FixedSun)
1187 flags |= RegionFlags.SunFixed; 1191 flags |= RegionFlags.SunFixed;
diff --git a/OpenSim/Region/CoreModules/World/Land/LandObject.cs b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
index 6c9bb10..2a6d362 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandObject.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
@@ -304,7 +304,7 @@ namespace OpenSim.Region.CoreModules.World.Land
304 304
305 allowedDelta |= (uint)(ParcelFlags.ShowDirectory | 305 allowedDelta |= (uint)(ParcelFlags.ShowDirectory |
306 ParcelFlags.AllowPublish | 306 ParcelFlags.AllowPublish |
307 ParcelFlags.MaturePublish); 307 ParcelFlags.MaturePublish) | (uint)(1 << 23);
308 } 308 }
309 309
310 if (m_scene.Permissions.CanEditParcelProperties(remote_client.AgentId,this, GroupPowers.LandChangeIdentity)) 310 if (m_scene.Permissions.CanEditParcelProperties(remote_client.AgentId,this, GroupPowers.LandChangeIdentity))