aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorMelanie2010-04-14 10:42:14 +0100
committerMelanie2010-04-14 10:42:14 +0100
commit1636f535ba1915732927054be36b909b67a6de6c (patch)
treeecbe5909fb8855eee44526c3e4a5164eadf1f688 /OpenSim/Region
parentChange ISnmpModule to use scene references (diff)
downloadopensim-SC_OLD-1636f535ba1915732927054be36b909b67a6de6c.zip
opensim-SC_OLD-1636f535ba1915732927054be36b909b67a6de6c.tar.gz
opensim-SC_OLD-1636f535ba1915732927054be36b909b67a6de6c.tar.bz2
opensim-SC_OLD-1636f535ba1915732927054be36b909b67a6de6c.tar.xz
Committing sacha's partial work (from orpheus). The GridBrat needs to learn
a bit of git
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Application/OpenSimBase.cs45
-rw-r--r--OpenSim/Region/Framework/Interfaces/ISnmpModule.cs2
2 files changed, 46 insertions, 1 deletions
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index cf2ab65..f3aaa76 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -346,10 +346,28 @@ namespace OpenSim
346 else m_log.Error("[MODULES]: The new RegionModulesController is missing..."); 346 else m_log.Error("[MODULES]: The new RegionModulesController is missing...");
347 347
348 scene.SetModuleInterfaces(); 348 scene.SetModuleInterfaces();
349// First Step of bootreport sequence
350 if (scene.SnmpService != null)
351 {
352 scene.SnmpService.ColdStart(1,scene);
353 }
354
355// it should be a LinkDown event
356// Maped inside opennms
357// bad...
358 if (scene.SnmpService != null)
359 {
360 scene.SnmpService.Warning("Loading prins", scene);
361 }
349 362
350 // Prims have to be loaded after module configuration since some modules may be invoked during the load 363 // Prims have to be loaded after module configuration since some modules may be invoked during the load
351 scene.LoadPrimsFromStorage(regionInfo.originRegionID); 364 scene.LoadPrimsFromStorage(regionInfo.originRegionID);
352 365
366 if (scene.SnmpService != null)
367 {
368 scene.SnmpService.Warning("Creating region texture", scene);
369 }
370
353 // moved these here as the terrain texture has to be created after the modules are initialized 371 // moved these here as the terrain texture has to be created after the modules are initialized
354 // and has to happen before the region is registered with the grid. 372 // and has to happen before the region is registered with the grid.
355 scene.CreateTerrainTexture(false); 373 scene.CreateTerrainTexture(false);
@@ -357,6 +375,10 @@ namespace OpenSim
357 // TODO : Try setting resource for region xstats here on scene 375 // TODO : Try setting resource for region xstats here on scene
358 MainServer.Instance.AddStreamHandler(new Region.Framework.Scenes.RegionStatsHandler(regionInfo)); 376 MainServer.Instance.AddStreamHandler(new Region.Framework.Scenes.RegionStatsHandler(regionInfo));
359 377
378 if (scene.SnmpService != null)
379 {
380 scene.SnmpService.Warning("Grid Registration in progress", scene);
381 }
360 try 382 try
361 { 383 {
362 scene.RegisterRegionWithGrid(); 384 scene.RegisterRegionWithGrid();
@@ -365,11 +387,20 @@ namespace OpenSim
365 { 387 {
366 m_log.ErrorFormat("[STARTUP]: Registration of region with grid failed, aborting startup - {0}", e.StackTrace); 388 m_log.ErrorFormat("[STARTUP]: Registration of region with grid failed, aborting startup - {0}", e.StackTrace);
367 389
390 if (scene.SnmpService != null)
391 {
392 scene.SnmpService.Critical("Grid registration failed. Startup aborted.", scene);
393 }
368 // Carrying on now causes a lot of confusion down the 394 // Carrying on now causes a lot of confusion down the
369 // line - we need to get the user's attention 395 // line - we need to get the user's attention
370 Environment.Exit(1); 396 Environment.Exit(1);
371 } 397 }
372 398
399 if (scene.SnmpService != null)
400 {
401 scene.SnmpService.Warning("Grid Registration done", scene);
402 }
403
373 // We need to do this after we've initialized the 404 // We need to do this after we've initialized the
374 // scripting engines. 405 // scripting engines.
375 scene.CreateScriptInstances(); 406 scene.CreateScriptInstances();
@@ -377,6 +408,11 @@ namespace OpenSim
377 scene.loadAllLandObjectsFromStorage(regionInfo.originRegionID); 408 scene.loadAllLandObjectsFromStorage(regionInfo.originRegionID);
378 scene.EventManager.TriggerParcelPrimCountUpdate(); 409 scene.EventManager.TriggerParcelPrimCountUpdate();
379 410
411 if (scene.SnmpService != null)
412 {
413 scene.SnmpService.Warning("ScriptEngine started", scene);
414 }
415
380 m_sceneManager.Add(scene); 416 m_sceneManager.Add(scene);
381 417
382 if (m_autoCreateClientStack) 418 if (m_autoCreateClientStack)
@@ -385,6 +421,10 @@ namespace OpenSim
385 clientServer.Start(); 421 clientServer.Start();
386 } 422 }
387 423
424 if (scene.SnmpService != null)
425 {
426 scene.SnmpService.Warning("Initializing region modules", scene);
427 }
388 if (do_post_init) 428 if (do_post_init)
389 { 429 {
390 foreach (IRegionModule module in modules) 430 foreach (IRegionModule module in modules)
@@ -396,6 +436,11 @@ namespace OpenSim
396 436
397 mscene = scene; 437 mscene = scene;
398 438
439 if (scene.SnmpService != null)
440 {
441 scene.SnmpService.Warning("The region is operational", scene);
442 }
443
399 scene.StartTimer(); 444 scene.StartTimer();
400 445
401 return clientServer; 446 return clientServer;
diff --git a/OpenSim/Region/Framework/Interfaces/ISnmpModule.cs b/OpenSim/Region/Framework/Interfaces/ISnmpModule.cs
index 5143b21..8a83fe9 100644
--- a/OpenSim/Region/Framework/Interfaces/ISnmpModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/ISnmpModule.cs
@@ -10,7 +10,7 @@ using OpenSim.Region.Framework.Scenes;
10public interface ISnmpModule 10public interface ISnmpModule
11{ 11{
12 void Trap(int code, string Message, Scene scene); 12 void Trap(int code, string Message, Scene scene);
13 void Critcal(string Message, Scene scene); 13 void Critical(string Message, Scene scene);
14 void Warning(string Message, Scene scene); 14 void Warning(string Message, Scene scene);
15 void Major(string Message, Scene scene); 15 void Major(string Message, Scene scene);
16 void ColdStart(int step , Scene scene); 16 void ColdStart(int step , Scene scene);