From 6460e587c470361173291337ad222f48c13a10ce Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 18 Jul 2012 21:29:12 +0100
Subject: Pass entire scene object in OnLoginsEnabled event rather than just
the region name.
This saves listeners from having to re-retrieve the scene from their own lists, which won't work anyway if multiple regions with the same name have been allowed
---
OpenSim/Region/Framework/Scenes/EventManager.cs | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
(limited to 'OpenSim/Region/Framework/Scenes/EventManager.cs')
diff --git a/OpenSim/Region/Framework/Scenes/EventManager.cs b/OpenSim/Region/Framework/Scenes/EventManager.cs
index f92ed8e..e2380b7 100644
--- a/OpenSim/Region/Framework/Scenes/EventManager.cs
+++ b/OpenSim/Region/Framework/Scenes/EventManager.cs
@@ -496,14 +496,13 @@ namespace OpenSim.Region.Framework.Scenes
public delegate void RegionHeartbeatEnd(Scene scene);
public event RegionHeartbeatEnd OnRegionHeartbeatEnd;
- public delegate void LoginsEnabled(string regionName);
-
///
/// This should only fire in all circumstances if the RegionReady module is active.
///
///
/// TODO: Fire this even when the RegionReady module is not active.
///
+ public delegate void LoginsEnabled(IScene scene);
public event LoginsEnabled OnLoginsEnabled;
public delegate void PrimsLoaded(Scene s);
@@ -2477,7 +2476,7 @@ namespace OpenSim.Region.Framework.Scenes
}
}
- public void TriggerLoginsEnabled (string regionName)
+ public void TriggerLoginsEnabled(Scene scene)
{
LoginsEnabled handler = OnLoginsEnabled;
@@ -2487,7 +2486,7 @@ namespace OpenSim.Region.Framework.Scenes
{
try
{
- d(regionName);
+ d(scene);
}
catch (Exception e)
{
--
cgit v1.1