diff options
Diffstat (limited to 'OpenSim/Region/Application/OpenSimBase.cs')
-rw-r--r-- | OpenSim/Region/Application/OpenSimBase.cs | 49 |
1 files changed, 49 insertions, 0 deletions
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs index cf2ab65..1ec96a0 100644 --- a/OpenSim/Region/Application/OpenSimBase.cs +++ b/OpenSim/Region/Application/OpenSimBase.cs | |||
@@ -346,10 +346,26 @@ 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 | scene.SnmpService.LinkDown(scene); | ||
354 | } | ||
355 | |||
356 | if (scene.SnmpService != null) | ||
357 | { | ||
358 | scene.SnmpService.BootInfo("Loading prins", scene); | ||
359 | } | ||
349 | 360 | ||
350 | // Prims have to be loaded after module configuration since some modules may be invoked during the load | 361 | // Prims have to be loaded after module configuration since some modules may be invoked during the load |
351 | scene.LoadPrimsFromStorage(regionInfo.originRegionID); | 362 | scene.LoadPrimsFromStorage(regionInfo.originRegionID); |
352 | 363 | ||
364 | if (scene.SnmpService != null) | ||
365 | { | ||
366 | scene.SnmpService.BootInfo("Creating region texture", scene); | ||
367 | } | ||
368 | |||
353 | // moved these here as the terrain texture has to be created after the modules are initialized | 369 | // 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. | 370 | // and has to happen before the region is registered with the grid. |
355 | scene.CreateTerrainTexture(false); | 371 | scene.CreateTerrainTexture(false); |
@@ -357,6 +373,10 @@ namespace OpenSim | |||
357 | // TODO : Try setting resource for region xstats here on scene | 373 | // TODO : Try setting resource for region xstats here on scene |
358 | MainServer.Instance.AddStreamHandler(new Region.Framework.Scenes.RegionStatsHandler(regionInfo)); | 374 | MainServer.Instance.AddStreamHandler(new Region.Framework.Scenes.RegionStatsHandler(regionInfo)); |
359 | 375 | ||
376 | if (scene.SnmpService != null) | ||
377 | { | ||
378 | scene.SnmpService.BootInfo("Grid Registration in progress", scene); | ||
379 | } | ||
360 | try | 380 | try |
361 | { | 381 | { |
362 | scene.RegisterRegionWithGrid(); | 382 | scene.RegisterRegionWithGrid(); |
@@ -365,11 +385,20 @@ namespace OpenSim | |||
365 | { | 385 | { |
366 | m_log.ErrorFormat("[STARTUP]: Registration of region with grid failed, aborting startup - {0}", e.StackTrace); | 386 | m_log.ErrorFormat("[STARTUP]: Registration of region with grid failed, aborting startup - {0}", e.StackTrace); |
367 | 387 | ||
388 | if (scene.SnmpService != null) | ||
389 | { | ||
390 | scene.SnmpService.Critical("Grid registration failed. Startup aborted.", scene); | ||
391 | } | ||
368 | // Carrying on now causes a lot of confusion down the | 392 | // Carrying on now causes a lot of confusion down the |
369 | // line - we need to get the user's attention | 393 | // line - we need to get the user's attention |
370 | Environment.Exit(1); | 394 | Environment.Exit(1); |
371 | } | 395 | } |
372 | 396 | ||
397 | if (scene.SnmpService != null) | ||
398 | { | ||
399 | scene.SnmpService.BootInfo("Grid Registration done", scene); | ||
400 | } | ||
401 | |||
373 | // We need to do this after we've initialized the | 402 | // We need to do this after we've initialized the |
374 | // scripting engines. | 403 | // scripting engines. |
375 | scene.CreateScriptInstances(); | 404 | scene.CreateScriptInstances(); |
@@ -377,6 +406,11 @@ namespace OpenSim | |||
377 | scene.loadAllLandObjectsFromStorage(regionInfo.originRegionID); | 406 | scene.loadAllLandObjectsFromStorage(regionInfo.originRegionID); |
378 | scene.EventManager.TriggerParcelPrimCountUpdate(); | 407 | scene.EventManager.TriggerParcelPrimCountUpdate(); |
379 | 408 | ||
409 | if (scene.SnmpService != null) | ||
410 | { | ||
411 | scene.SnmpService.BootInfo("ScriptEngine started", scene); | ||
412 | } | ||
413 | |||
380 | m_sceneManager.Add(scene); | 414 | m_sceneManager.Add(scene); |
381 | 415 | ||
382 | if (m_autoCreateClientStack) | 416 | if (m_autoCreateClientStack) |
@@ -385,6 +419,10 @@ namespace OpenSim | |||
385 | clientServer.Start(); | 419 | clientServer.Start(); |
386 | } | 420 | } |
387 | 421 | ||
422 | if (scene.SnmpService != null) | ||
423 | { | ||
424 | scene.SnmpService.BootInfo("Initializing region modules", scene); | ||
425 | } | ||
388 | if (do_post_init) | 426 | if (do_post_init) |
389 | { | 427 | { |
390 | foreach (IRegionModule module in modules) | 428 | foreach (IRegionModule module in modules) |
@@ -396,6 +434,12 @@ namespace OpenSim | |||
396 | 434 | ||
397 | mscene = scene; | 435 | mscene = scene; |
398 | 436 | ||
437 | if (scene.SnmpService != null) | ||
438 | { | ||
439 | scene.SnmpService.BootInfo("The region is operational", scene); | ||
440 | scene.SnmpService.LinkUp(scene); | ||
441 | } | ||
442 | |||
399 | scene.StartTimer(); | 443 | scene.StartTimer(); |
400 | 444 | ||
401 | return clientServer; | 445 | return clientServer; |
@@ -404,6 +448,11 @@ namespace OpenSim | |||
404 | private void ShutdownRegion(Scene scene) | 448 | private void ShutdownRegion(Scene scene) |
405 | { | 449 | { |
406 | m_log.DebugFormat("[SHUTDOWN]: Shutting down region {0}", scene.RegionInfo.RegionName); | 450 | m_log.DebugFormat("[SHUTDOWN]: Shutting down region {0}", scene.RegionInfo.RegionName); |
451 | if (scene.SnmpService != null) | ||
452 | { | ||
453 | scene.SnmpService.BootInfo("The region is shutting down", scene); | ||
454 | scene.SnmpService.LinkDown(scene); | ||
455 | } | ||
407 | IRegionModulesController controller; | 456 | IRegionModulesController controller; |
408 | if (ApplicationRegistry.TryGet<IRegionModulesController>(out controller)) | 457 | if (ApplicationRegistry.TryGet<IRegionModulesController>(out controller)) |
409 | { | 458 | { |