diff options
author | Melanie | 2011-06-20 02:29:09 +0200 |
---|---|---|
committer | Melanie | 2011-06-20 02:29:09 +0200 |
commit | 163ee8216873f963efd3ea42dd007b095214bce0 (patch) | |
tree | e45f31851f202e06f956013d98a4c86d6d016b9d /OpenSim/Region/CoreModules/World | |
parent | Make the last otem in a list created with llCSV2List findable (diff) | |
download | opensim-SC-163ee8216873f963efd3ea42dd007b095214bce0.zip opensim-SC-163ee8216873f963efd3ea42dd007b095214bce0.tar.gz opensim-SC-163ee8216873f963efd3ea42dd007b095214bce0.tar.bz2 opensim-SC-163ee8216873f963efd3ea42dd007b095214bce0.tar.xz |
Add some flags to control content in search better
Diffstat (limited to 'OpenSim/Region/CoreModules/World')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/World/Land/LandObject.cs | 2 |
2 files changed, 5 insertions, 1 deletions
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)) |