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