diff options
author | Justin Clark-Casey (justincc) | 2012-07-25 21:00:59 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-07-25 21:00:59 +0100 |
commit | 31304c222df1e5a832afd0ebcf7d3ed403543e54 (patch) | |
tree | d139e3f34534caa4f31c58503b88bd02a3385d45 /OpenSim/Region/Framework/Scenes/EventManager.cs | |
parent | Rename "image queues clear" console command to "clear image queues" (diff) | |
download | opensim-SC_OLD-31304c222df1e5a832afd0ebcf7d3ed403543e54.zip opensim-SC_OLD-31304c222df1e5a832afd0ebcf7d3ed403543e54.tar.gz opensim-SC_OLD-31304c222df1e5a832afd0ebcf7d3ed403543e54.tar.bz2 opensim-SC_OLD-31304c222df1e5a832afd0ebcf7d3ed403543e54.tar.xz |
Make SceneManager.OnRegionsReadyStatusChange event available.
This is fired when all regions are ready or when at least one region becomes not ready.
Recently added EventManager.OnRegionReady becomes OnRegionReadyStatusChange to match OnLoginsEnabledStatusChange
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/EventManager.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/EventManager.cs | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/OpenSim/Region/Framework/Scenes/EventManager.cs b/OpenSim/Region/Framework/Scenes/EventManager.cs index 620b605..6dea2f0 100644 --- a/OpenSim/Region/Framework/Scenes/EventManager.cs +++ b/OpenSim/Region/Framework/Scenes/EventManager.cs | |||
@@ -513,8 +513,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
513 | /// 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 |
514 | /// have been completed. | 514 | /// have been completed. |
515 | /// </remarks> | 515 | /// </remarks> |
516 | public event RegionReady OnRegionReady; | 516 | public event Action<IScene> OnRegionReadyStatusChange; |
517 | public delegate void RegionReady(IScene scene); | ||
518 | 517 | ||
519 | public delegate void PrimsLoaded(Scene s); | 518 | public delegate void PrimsLoaded(Scene s); |
520 | public event PrimsLoaded OnPrimsLoaded; | 519 | public event PrimsLoaded OnPrimsLoaded; |
@@ -2508,13 +2507,13 @@ namespace OpenSim.Region.Framework.Scenes | |||
2508 | } | 2507 | } |
2509 | } | 2508 | } |
2510 | 2509 | ||
2511 | public void TriggerRegionReady(IScene scene) | 2510 | public void TriggerRegionReadyStatusChange(IScene scene) |
2512 | { | 2511 | { |
2513 | RegionReady handler = OnRegionReady; | 2512 | Action<IScene> handler = OnRegionReadyStatusChange; |
2514 | 2513 | ||
2515 | if (handler != null) | 2514 | if (handler != null) |
2516 | { | 2515 | { |
2517 | foreach (RegionReady d in handler.GetInvocationList()) | 2516 | foreach (Action<IScene> d in handler.GetInvocationList()) |
2518 | { | 2517 | { |
2519 | try | 2518 | try |
2520 | { | 2519 | { |
@@ -2522,7 +2521,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2522 | } | 2521 | } |
2523 | catch (Exception e) | 2522 | catch (Exception e) |
2524 | { | 2523 | { |
2525 | m_log.ErrorFormat("[EVENT MANAGER]: Delegate for OnRegionReady failed - continuing {0} - {1}", | 2524 | m_log.ErrorFormat("[EVENT MANAGER]: Delegate for OnRegionReadyStatusChange failed - continuing {0} - {1}", |
2526 | e.Message, e.StackTrace); | 2525 | e.Message, e.StackTrace); |
2527 | } | 2526 | } |
2528 | } | 2527 | } |