diff options
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/EventManager.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/EventManager.cs | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/OpenSim/Region/Framework/Scenes/EventManager.cs b/OpenSim/Region/Framework/Scenes/EventManager.cs index b8ae0ac..620b605 100644 --- a/OpenSim/Region/Framework/Scenes/EventManager.cs +++ b/OpenSim/Region/Framework/Scenes/EventManager.cs | |||
@@ -497,13 +497,14 @@ namespace OpenSim.Region.Framework.Scenes | |||
497 | public event RegionHeartbeatEnd OnRegionHeartbeatEnd; | 497 | public event RegionHeartbeatEnd OnRegionHeartbeatEnd; |
498 | 498 | ||
499 | /// <summary> | 499 | /// <summary> |
500 | /// This should only fire in all circumstances if the RegionReady module is active. | 500 | /// Fired when logins to a region are enabled or disabled. |
501 | /// </summary> | 501 | /// </summary> |
502 | /// <remarks> | 502 | /// <remarks> |
503 | /// TODO: Fire this even when the RegionReady module is not active. | 503 | /// |
504 | /// </remarks> | 504 | /// </remarks> |
505 | public delegate void LoginsEnabled(IScene scene); | 505 | /// Fired |
506 | public event LoginsEnabled OnLoginsEnabled; | 506 | public event RegionLoginsStatusChange OnRegionLoginsStatusChange; |
507 | public delegate void RegionLoginsStatusChange(IScene scene); | ||
507 | 508 | ||
508 | /// <summary> | 509 | /// <summary> |
509 | /// Fired when a region is considered ready for use. | 510 | /// Fired when a region is considered ready for use. |
@@ -512,8 +513,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
512 | /// A region is considered ready when startup operations such as loading of scripts already on the region | 513 | /// A region is considered ready when startup operations such as loading of scripts already on the region |
513 | /// have been completed. | 514 | /// have been completed. |
514 | /// </remarks> | 515 | /// </remarks> |
515 | public delegate void RegionReady(IScene scene); | ||
516 | public event RegionReady OnRegionReady; | 516 | public event RegionReady OnRegionReady; |
517 | public delegate void RegionReady(IScene scene); | ||
517 | 518 | ||
518 | public delegate void PrimsLoaded(Scene s); | 519 | public delegate void PrimsLoaded(Scene s); |
519 | public event PrimsLoaded OnPrimsLoaded; | 520 | public event PrimsLoaded OnPrimsLoaded; |
@@ -2486,13 +2487,13 @@ namespace OpenSim.Region.Framework.Scenes | |||
2486 | } | 2487 | } |
2487 | } | 2488 | } |
2488 | 2489 | ||
2489 | public void TriggerLoginsEnabled(IScene scene) | 2490 | public void TriggerRegionLoginsStatusChange(IScene scene) |
2490 | { | 2491 | { |
2491 | LoginsEnabled handler = OnLoginsEnabled; | 2492 | RegionLoginsStatusChange handler = OnRegionLoginsStatusChange; |
2492 | 2493 | ||
2493 | if (handler != null) | 2494 | if (handler != null) |
2494 | { | 2495 | { |
2495 | foreach (LoginsEnabled d in handler.GetInvocationList()) | 2496 | foreach (RegionLoginsStatusChange d in handler.GetInvocationList()) |
2496 | { | 2497 | { |
2497 | try | 2498 | try |
2498 | { | 2499 | { |
@@ -2500,13 +2501,13 @@ namespace OpenSim.Region.Framework.Scenes | |||
2500 | } | 2501 | } |
2501 | catch (Exception e) | 2502 | catch (Exception e) |
2502 | { | 2503 | { |
2503 | m_log.ErrorFormat("[EVENT MANAGER]: Delegate for OnLoginsEnabled failed - continuing {0} - {1}", | 2504 | m_log.ErrorFormat("[EVENT MANAGER]: Delegate for OnRegionLoginsStatusChange failed - continuing {0} - {1}", |
2504 | e.Message, e.StackTrace); | 2505 | e.Message, e.StackTrace); |
2505 | } | 2506 | } |
2506 | } | 2507 | } |
2507 | } | 2508 | } |
2508 | } | 2509 | } |
2509 | 2510 | ||
2510 | public void TriggerRegionReady(IScene scene) | 2511 | public void TriggerRegionReady(IScene scene) |
2511 | { | 2512 | { |
2512 | RegionReady handler = OnRegionReady; | 2513 | RegionReady handler = OnRegionReady; |