diff options
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs index 17387da..4750b46 100644 --- a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs +++ b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs | |||
@@ -331,6 +331,16 @@ namespace OpenSim.Region.CoreModules.World.Estate | |||
331 | IRestartModule restartModule = Scene.RequestModuleInterface<IRestartModule>(); | 331 | IRestartModule restartModule = Scene.RequestModuleInterface<IRestartModule>(); |
332 | if (restartModule != null) | 332 | if (restartModule != null) |
333 | { | 333 | { |
334 | if (timeInSeconds == -1) | ||
335 | { | ||
336 | m_delayCount++; | ||
337 | if (m_delayCount > 3) | ||
338 | return; | ||
339 | |||
340 | restartModule.DelayRestart(3600, "Restart delayed by region manager"); | ||
341 | return; | ||
342 | } | ||
343 | |||
334 | List<int> times = new List<int>(); | 344 | List<int> times = new List<int>(); |
335 | while (timeInSeconds > 0) | 345 | while (timeInSeconds > 0) |
336 | { | 346 | { |
@@ -1256,6 +1266,10 @@ namespace OpenSim.Region.CoreModules.World.Estate | |||
1256 | flags |= RegionFlags.AllowParcelChanges; | 1266 | flags |= RegionFlags.AllowParcelChanges; |
1257 | if (Scene.RegionInfo.RegionSettings.BlockShowInSearch) | 1267 | if (Scene.RegionInfo.RegionSettings.BlockShowInSearch) |
1258 | flags |= RegionFlags.BlockParcelSearch; | 1268 | flags |= RegionFlags.BlockParcelSearch; |
1269 | if (Scene.RegionInfo.RegionSettings.GodBlockSearch) | ||
1270 | flags |= (RegionFlags)(1 << 11); | ||
1271 | if (Scene.RegionInfo.RegionSettings.Casino) | ||
1272 | flags |= (RegionFlags)(1 << 10); | ||
1259 | 1273 | ||
1260 | if (Scene.RegionInfo.RegionSettings.FixedSun) | 1274 | if (Scene.RegionInfo.RegionSettings.FixedSun) |
1261 | flags |= RegionFlags.SunFixed; | 1275 | flags |= RegionFlags.SunFixed; |