diff options
author | Melanie | 2012-07-28 00:39:36 +0100 |
---|---|---|
committer | Melanie | 2012-07-28 00:39:36 +0100 |
commit | 771d79e83e9ef5686aee5fe1c572673cff291083 (patch) | |
tree | b37749fc1929ffd6dd1b9c2c4e29120accf26b99 /OpenSim/Region/Framework/Scenes/EventManager.cs | |
parent | Merge branch 'master' into careminster (diff) | |
parent | LSL/OSSL lacks Math.Min & Math.Max implementations. (diff) | |
download | opensim-SC_OLD-771d79e83e9ef5686aee5fe1c572673cff291083.zip opensim-SC_OLD-771d79e83e9ef5686aee5fe1c572673cff291083.tar.gz opensim-SC_OLD-771d79e83e9ef5686aee5fe1c572673cff291083.tar.bz2 opensim-SC_OLD-771d79e83e9ef5686aee5fe1c572673cff291083.tar.xz |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Framework/Monitoring/BaseStatsCollector.cs
OpenSim/Region/Application/OpenSim.cs
OpenSim/Region/Application/OpenSimBase.cs
OpenSim/Region/Framework/Scenes/SceneManager.cs
bin/OpenMetaverse.Rendering.Meshmerizer.dll
bin/OpenMetaverse.StructuredData.dll
bin/OpenMetaverse.dll
bin/OpenMetaverseTypes.dll
prebuild.xml
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 418904f..7cb3811 100644 --- a/OpenSim/Region/Framework/Scenes/EventManager.cs +++ b/OpenSim/Region/Framework/Scenes/EventManager.cs | |||
@@ -517,8 +517,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
517 | /// A region is considered ready when startup operations such as loading of scripts already on the region | 517 | /// A region is considered ready when startup operations such as loading of scripts already on the region |
518 | /// have been completed. | 518 | /// have been completed. |
519 | /// </remarks> | 519 | /// </remarks> |
520 | public event RegionReady OnRegionReady; | 520 | public event Action<IScene> OnRegionReadyStatusChange; |
521 | public delegate void RegionReady(IScene scene); | ||
522 | 521 | ||
523 | public delegate void PrimsLoaded(Scene s); | 522 | public delegate void PrimsLoaded(Scene s); |
524 | public event PrimsLoaded OnPrimsLoaded; | 523 | public event PrimsLoaded OnPrimsLoaded; |
@@ -2533,13 +2532,13 @@ namespace OpenSim.Region.Framework.Scenes | |||
2533 | } | 2532 | } |
2534 | } | 2533 | } |
2535 | 2534 | ||
2536 | public void TriggerRegionReady(IScene scene) | 2535 | public void TriggerRegionReadyStatusChange(IScene scene) |
2537 | { | 2536 | { |
2538 | RegionReady handler = OnRegionReady; | 2537 | Action<IScene> handler = OnRegionReadyStatusChange; |
2539 | 2538 | ||
2540 | if (handler != null) | 2539 | if (handler != null) |
2541 | { | 2540 | { |
2542 | foreach (RegionReady d in handler.GetInvocationList()) | 2541 | foreach (Action<IScene> d in handler.GetInvocationList()) |
2543 | { | 2542 | { |
2544 | try | 2543 | try |
2545 | { | 2544 | { |
@@ -2547,7 +2546,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2547 | } | 2546 | } |
2548 | catch (Exception e) | 2547 | catch (Exception e) |
2549 | { | 2548 | { |
2550 | m_log.ErrorFormat("[EVENT MANAGER]: Delegate for OnRegionReady failed - continuing {0} - {1}", | 2549 | m_log.ErrorFormat("[EVENT MANAGER]: Delegate for OnRegionReadyStatusChange failed - continuing {0} - {1}", |
2551 | e.Message, e.StackTrace); | 2550 | e.Message, e.StackTrace); |
2552 | } | 2551 | } |
2553 | } | 2552 | } |