diff options
Diffstat (limited to 'OpenSim/Region/CoreModules')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs | 25 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/World/Region/RestartModule.cs | 6 |
2 files changed, 22 insertions, 9 deletions
diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs index e1c5418..dc062b6 100644 --- a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs +++ b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs | |||
@@ -294,6 +294,10 @@ namespace OpenSim.Region.CoreModules.World.Estate | |||
294 | } | 294 | } |
295 | 295 | ||
296 | restartModule.ScheduleRestart(UUID.Zero, "Region will restart in {0}", times.ToArray(), false); | 296 | restartModule.ScheduleRestart(UUID.Zero, "Region will restart in {0}", times.ToArray(), false); |
297 | |||
298 | m_log.InfoFormat( | ||
299 | "User {0} requested restart of region {1} in {2} seconds", | ||
300 | remoteClient.Name, Scene.Name, times.Count != 0 ? times[0] : 0); | ||
297 | } | 301 | } |
298 | } | 302 | } |
299 | 303 | ||
@@ -318,7 +322,7 @@ namespace OpenSim.Region.CoreModules.World.Estate | |||
318 | 322 | ||
319 | if ((estateAccessType & 4) != 0) // User add | 323 | if ((estateAccessType & 4) != 0) // User add |
320 | { | 324 | { |
321 | if (Scene.Permissions.CanIssueEstateCommand(remote_client.AgentId, true) || Scene.Permissions.BypassPermissions()) | 325 | if (Scene.Permissions.CanIssueEstateCommand(remote_client.AgentId, true)) |
322 | { | 326 | { |
323 | if ((estateAccessType & 1) != 0) // All estates | 327 | if ((estateAccessType & 1) != 0) // All estates |
324 | { | 328 | { |
@@ -350,7 +354,7 @@ namespace OpenSim.Region.CoreModules.World.Estate | |||
350 | } | 354 | } |
351 | if ((estateAccessType & 8) != 0) // User remove | 355 | if ((estateAccessType & 8) != 0) // User remove |
352 | { | 356 | { |
353 | if (Scene.Permissions.CanIssueEstateCommand(remote_client.AgentId, true) || Scene.Permissions.BypassPermissions()) | 357 | if (Scene.Permissions.CanIssueEstateCommand(remote_client.AgentId, true)) |
354 | { | 358 | { |
355 | if ((estateAccessType & 1) != 0) // All estates | 359 | if ((estateAccessType & 1) != 0) // All estates |
356 | { | 360 | { |
@@ -381,7 +385,7 @@ namespace OpenSim.Region.CoreModules.World.Estate | |||
381 | } | 385 | } |
382 | if ((estateAccessType & 16) != 0) // Group add | 386 | if ((estateAccessType & 16) != 0) // Group add |
383 | { | 387 | { |
384 | if (Scene.Permissions.CanIssueEstateCommand(remote_client.AgentId, true) || Scene.Permissions.BypassPermissions()) | 388 | if (Scene.Permissions.CanIssueEstateCommand(remote_client.AgentId, true)) |
385 | { | 389 | { |
386 | if ((estateAccessType & 1) != 0) // All estates | 390 | if ((estateAccessType & 1) != 0) // All estates |
387 | { | 391 | { |
@@ -410,9 +414,10 @@ namespace OpenSim.Region.CoreModules.World.Estate | |||
410 | remote_client.SendAlertMessage("Method EstateAccessDelta Failed, you don't have permissions"); | 414 | remote_client.SendAlertMessage("Method EstateAccessDelta Failed, you don't have permissions"); |
411 | } | 415 | } |
412 | } | 416 | } |
417 | |||
413 | if ((estateAccessType & 32) != 0) // Group remove | 418 | if ((estateAccessType & 32) != 0) // Group remove |
414 | { | 419 | { |
415 | if (Scene.Permissions.CanIssueEstateCommand(remote_client.AgentId, true) || Scene.Permissions.BypassPermissions()) | 420 | if (Scene.Permissions.CanIssueEstateCommand(remote_client.AgentId, true)) |
416 | { | 421 | { |
417 | if ((estateAccessType & 1) != 0) // All estates | 422 | if ((estateAccessType & 1) != 0) // All estates |
418 | { | 423 | { |
@@ -441,9 +446,10 @@ namespace OpenSim.Region.CoreModules.World.Estate | |||
441 | remote_client.SendAlertMessage("Method EstateAccessDelta Failed, you don't have permissions"); | 446 | remote_client.SendAlertMessage("Method EstateAccessDelta Failed, you don't have permissions"); |
442 | } | 447 | } |
443 | } | 448 | } |
449 | |||
444 | if ((estateAccessType & 64) != 0) // Ban add | 450 | if ((estateAccessType & 64) != 0) // Ban add |
445 | { | 451 | { |
446 | if (Scene.Permissions.CanIssueEstateCommand(remote_client.AgentId, false) || Scene.Permissions.BypassPermissions()) | 452 | if (Scene.Permissions.CanIssueEstateCommand(remote_client.AgentId, false)) |
447 | { | 453 | { |
448 | EstateBan[] banlistcheck = Scene.RegionInfo.EstateSettings.EstateBans; | 454 | EstateBan[] banlistcheck = Scene.RegionInfo.EstateSettings.EstateBans; |
449 | 455 | ||
@@ -522,9 +528,10 @@ namespace OpenSim.Region.CoreModules.World.Estate | |||
522 | remote_client.SendAlertMessage("Method EstateAccessDelta Failed, you don't have permissions"); | 528 | remote_client.SendAlertMessage("Method EstateAccessDelta Failed, you don't have permissions"); |
523 | } | 529 | } |
524 | } | 530 | } |
531 | |||
525 | if ((estateAccessType & 128) != 0) // Ban remove | 532 | if ((estateAccessType & 128) != 0) // Ban remove |
526 | { | 533 | { |
527 | if (Scene.Permissions.CanIssueEstateCommand(remote_client.AgentId, false) || Scene.Permissions.BypassPermissions()) | 534 | if (Scene.Permissions.CanIssueEstateCommand(remote_client.AgentId, false)) |
528 | { | 535 | { |
529 | EstateBan[] banlistcheck = Scene.RegionInfo.EstateSettings.EstateBans; | 536 | EstateBan[] banlistcheck = Scene.RegionInfo.EstateSettings.EstateBans; |
530 | 537 | ||
@@ -577,9 +584,10 @@ namespace OpenSim.Region.CoreModules.World.Estate | |||
577 | remote_client.SendAlertMessage("Method EstateAccessDelta Failed, you don't have permissions"); | 584 | remote_client.SendAlertMessage("Method EstateAccessDelta Failed, you don't have permissions"); |
578 | } | 585 | } |
579 | } | 586 | } |
587 | |||
580 | if ((estateAccessType & 256) != 0) // Manager add | 588 | if ((estateAccessType & 256) != 0) // Manager add |
581 | { | 589 | { |
582 | if (Scene.Permissions.CanIssueEstateCommand(remote_client.AgentId, true) || Scene.Permissions.BypassPermissions()) | 590 | if (Scene.Permissions.CanIssueEstateCommand(remote_client.AgentId, true)) |
583 | { | 591 | { |
584 | if ((estateAccessType & 1) != 0) // All estates | 592 | if ((estateAccessType & 1) != 0) // All estates |
585 | { | 593 | { |
@@ -608,9 +616,10 @@ namespace OpenSim.Region.CoreModules.World.Estate | |||
608 | remote_client.SendAlertMessage("Method EstateAccessDelta Failed, you don't have permissions"); | 616 | remote_client.SendAlertMessage("Method EstateAccessDelta Failed, you don't have permissions"); |
609 | } | 617 | } |
610 | } | 618 | } |
619 | |||
611 | if ((estateAccessType & 512) != 0) // Manager remove | 620 | if ((estateAccessType & 512) != 0) // Manager remove |
612 | { | 621 | { |
613 | if (Scene.Permissions.CanIssueEstateCommand(remote_client.AgentId, true) || Scene.Permissions.BypassPermissions()) | 622 | if (Scene.Permissions.CanIssueEstateCommand(remote_client.AgentId, true)) |
614 | { | 623 | { |
615 | if ((estateAccessType & 1) != 0) // All estates | 624 | if ((estateAccessType & 1) != 0) // All estates |
616 | { | 625 | { |
diff --git a/OpenSim/Region/CoreModules/World/Region/RestartModule.cs b/OpenSim/Region/CoreModules/World/Region/RestartModule.cs index 287738a..9c441ed 100644 --- a/OpenSim/Region/CoreModules/World/Region/RestartModule.cs +++ b/OpenSim/Region/CoreModules/World/Region/RestartModule.cs | |||
@@ -26,6 +26,7 @@ | |||
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.Linq; | ||
29 | using System.Reflection; | 30 | using System.Reflection; |
30 | using System.Timers; | 31 | using System.Timers; |
31 | using System.IO; | 32 | using System.IO; |
@@ -305,6 +306,9 @@ namespace OpenSim.Region.CoreModules.World.Region | |||
305 | for (int i = 4 ; i < args.Length ; i++) | 306 | for (int i = 4 ; i < args.Length ; i++) |
306 | times.Add(Convert.ToInt32(args[i])); | 307 | times.Add(Convert.ToInt32(args[i])); |
307 | 308 | ||
309 | MainConsole.Instance.OutputFormat( | ||
310 | "Region {0} scheduled for restart in {1} seconds", m_Scene.Name, times.Sum()); | ||
311 | |||
308 | ScheduleRestart(UUID.Zero, args[3], times.ToArray(), notice); | 312 | ScheduleRestart(UUID.Zero, args[3], times.ToArray(), notice); |
309 | } | 313 | } |
310 | 314 | ||
@@ -328,4 +332,4 @@ namespace OpenSim.Region.CoreModules.World.Region | |||
328 | } | 332 | } |
329 | } | 333 | } |
330 | } | 334 | } |
331 | } | 335 | } \ No newline at end of file |