aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-01-04 21:41:28 +0000
committerJustin Clark-Casey (justincc)2012-01-04 21:41:28 +0000
commit7e6c84c33476d393e0b9baf533fb22b668f6cca7 (patch)
treeea42933c84814b196b4a5544edcf7f340af1b8d3
parentMinor formatting changes and commented out log lines for future debugging of ... (diff)
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-7e6c84c33476d393e0b9baf533fb22b668f6cca7.zip
opensim-SC_OLD-7e6c84c33476d393e0b9baf533fb22b668f6cca7.tar.gz
opensim-SC_OLD-7e6c84c33476d393e0b9baf533fb22b668f6cca7.tar.bz2
opensim-SC_OLD-7e6c84c33476d393e0b9baf533fb22b668f6cca7.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
-rw-r--r--OpenSim/Region/Framework/Scenes/EventManager.cs24
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs1
2 files changed, 25 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/EventManager.cs b/OpenSim/Region/Framework/Scenes/EventManager.cs
index 4f71915..fd35c62 100644
--- a/OpenSim/Region/Framework/Scenes/EventManager.cs
+++ b/OpenSim/Region/Framework/Scenes/EventManager.cs
@@ -401,6 +401,9 @@ namespace OpenSim.Region.Framework.Scenes
401 public delegate void RegionUp(GridRegion region); 401 public delegate void RegionUp(GridRegion region);
402 public event RegionUp OnRegionUp; 402 public event RegionUp OnRegionUp;
403 403
404 public delegate void RegionStarted(Scene scene);
405 public event RegionStarted OnRegionStarted;
406
404 public delegate void LoginsEnabled(string regionName); 407 public delegate void LoginsEnabled(string regionName);
405 public event LoginsEnabled OnLoginsEnabled; 408 public event LoginsEnabled OnLoginsEnabled;
406 409
@@ -2243,6 +2246,27 @@ namespace OpenSim.Region.Framework.Scenes
2243 } 2246 }
2244 } 2247 }
2245 2248
2249 public void TriggerOnRegionStarted(Scene scene)
2250 {
2251 RegionStarted handler = OnRegionStarted;
2252
2253 if (handler != null)
2254 {
2255 foreach (RegionStarted d in handler.GetInvocationList())
2256 {
2257 try
2258 {
2259 d(scene);
2260 }
2261 catch (Exception e)
2262 {
2263 m_log.ErrorFormat("[EVENT MANAGER]: Delegate for RegionStarted failed - continuing {0} - {1}",
2264 e.Message, e.StackTrace);
2265 }
2266 }
2267 }
2268 }
2269
2246 public void TriggerLoginsEnabled (string regionName) 2270 public void TriggerLoginsEnabled (string regionName)
2247 { 2271 {
2248 LoginsEnabled handler = OnLoginsEnabled; 2272 LoginsEnabled handler = OnLoginsEnabled;
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 0f84da9..027ec96 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -1194,6 +1194,7 @@ namespace OpenSim.Region.Framework.Scenes
1194 1194
1195 try 1195 try
1196 { 1196 {
1197 m_eventManager.TriggerOnRegionStarted(this);
1197 while (!shuttingdown) 1198 while (!shuttingdown)
1198 Update(); 1199 Update();
1199 1200