Committing sacha's partial work (from orpheus). The GridBrat needs to learn
a bit of gitavinationmerge
parent
fac55bc78b
commit
1636f535ba
|
@ -346,10 +346,28 @@ namespace OpenSim
|
||||||
else m_log.Error("[MODULES]: The new RegionModulesController is missing...");
|
else m_log.Error("[MODULES]: The new RegionModulesController is missing...");
|
||||||
|
|
||||||
scene.SetModuleInterfaces();
|
scene.SetModuleInterfaces();
|
||||||
|
// First Step of bootreport sequence
|
||||||
|
if (scene.SnmpService != null)
|
||||||
|
{
|
||||||
|
scene.SnmpService.ColdStart(1,scene);
|
||||||
|
}
|
||||||
|
|
||||||
|
// it should be a LinkDown event
|
||||||
|
// Maped inside opennms
|
||||||
|
// bad...
|
||||||
|
if (scene.SnmpService != null)
|
||||||
|
{
|
||||||
|
scene.SnmpService.Warning("Loading prins", scene);
|
||||||
|
}
|
||||||
|
|
||||||
// Prims have to be loaded after module configuration since some modules may be invoked during the load
|
// Prims have to be loaded after module configuration since some modules may be invoked during the load
|
||||||
scene.LoadPrimsFromStorage(regionInfo.originRegionID);
|
scene.LoadPrimsFromStorage(regionInfo.originRegionID);
|
||||||
|
|
||||||
|
if (scene.SnmpService != null)
|
||||||
|
{
|
||||||
|
scene.SnmpService.Warning("Creating region texture", scene);
|
||||||
|
}
|
||||||
|
|
||||||
// moved these here as the terrain texture has to be created after the modules are initialized
|
// moved these here as the terrain texture has to be created after the modules are initialized
|
||||||
// and has to happen before the region is registered with the grid.
|
// and has to happen before the region is registered with the grid.
|
||||||
scene.CreateTerrainTexture(false);
|
scene.CreateTerrainTexture(false);
|
||||||
|
@ -357,6 +375,10 @@ namespace OpenSim
|
||||||
// TODO : Try setting resource for region xstats here on scene
|
// TODO : Try setting resource for region xstats here on scene
|
||||||
MainServer.Instance.AddStreamHandler(new Region.Framework.Scenes.RegionStatsHandler(regionInfo));
|
MainServer.Instance.AddStreamHandler(new Region.Framework.Scenes.RegionStatsHandler(regionInfo));
|
||||||
|
|
||||||
|
if (scene.SnmpService != null)
|
||||||
|
{
|
||||||
|
scene.SnmpService.Warning("Grid Registration in progress", scene);
|
||||||
|
}
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
scene.RegisterRegionWithGrid();
|
scene.RegisterRegionWithGrid();
|
||||||
|
@ -365,11 +387,20 @@ namespace OpenSim
|
||||||
{
|
{
|
||||||
m_log.ErrorFormat("[STARTUP]: Registration of region with grid failed, aborting startup - {0}", e.StackTrace);
|
m_log.ErrorFormat("[STARTUP]: Registration of region with grid failed, aborting startup - {0}", e.StackTrace);
|
||||||
|
|
||||||
|
if (scene.SnmpService != null)
|
||||||
|
{
|
||||||
|
scene.SnmpService.Critical("Grid registration failed. Startup aborted.", scene);
|
||||||
|
}
|
||||||
// Carrying on now causes a lot of confusion down the
|
// Carrying on now causes a lot of confusion down the
|
||||||
// line - we need to get the user's attention
|
// line - we need to get the user's attention
|
||||||
Environment.Exit(1);
|
Environment.Exit(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (scene.SnmpService != null)
|
||||||
|
{
|
||||||
|
scene.SnmpService.Warning("Grid Registration done", scene);
|
||||||
|
}
|
||||||
|
|
||||||
// We need to do this after we've initialized the
|
// We need to do this after we've initialized the
|
||||||
// scripting engines.
|
// scripting engines.
|
||||||
scene.CreateScriptInstances();
|
scene.CreateScriptInstances();
|
||||||
|
@ -377,6 +408,11 @@ namespace OpenSim
|
||||||
scene.loadAllLandObjectsFromStorage(regionInfo.originRegionID);
|
scene.loadAllLandObjectsFromStorage(regionInfo.originRegionID);
|
||||||
scene.EventManager.TriggerParcelPrimCountUpdate();
|
scene.EventManager.TriggerParcelPrimCountUpdate();
|
||||||
|
|
||||||
|
if (scene.SnmpService != null)
|
||||||
|
{
|
||||||
|
scene.SnmpService.Warning("ScriptEngine started", scene);
|
||||||
|
}
|
||||||
|
|
||||||
m_sceneManager.Add(scene);
|
m_sceneManager.Add(scene);
|
||||||
|
|
||||||
if (m_autoCreateClientStack)
|
if (m_autoCreateClientStack)
|
||||||
|
@ -385,6 +421,10 @@ namespace OpenSim
|
||||||
clientServer.Start();
|
clientServer.Start();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (scene.SnmpService != null)
|
||||||
|
{
|
||||||
|
scene.SnmpService.Warning("Initializing region modules", scene);
|
||||||
|
}
|
||||||
if (do_post_init)
|
if (do_post_init)
|
||||||
{
|
{
|
||||||
foreach (IRegionModule module in modules)
|
foreach (IRegionModule module in modules)
|
||||||
|
@ -396,6 +436,11 @@ namespace OpenSim
|
||||||
|
|
||||||
mscene = scene;
|
mscene = scene;
|
||||||
|
|
||||||
|
if (scene.SnmpService != null)
|
||||||
|
{
|
||||||
|
scene.SnmpService.Warning("The region is operational", scene);
|
||||||
|
}
|
||||||
|
|
||||||
scene.StartTimer();
|
scene.StartTimer();
|
||||||
|
|
||||||
return clientServer;
|
return clientServer;
|
||||||
|
|
|
@ -10,7 +10,7 @@ using OpenSim.Region.Framework.Scenes;
|
||||||
public interface ISnmpModule
|
public interface ISnmpModule
|
||||||
{
|
{
|
||||||
void Trap(int code, string Message, Scene scene);
|
void Trap(int code, string Message, Scene scene);
|
||||||
void Critcal(string Message, Scene scene);
|
void Critical(string Message, Scene scene);
|
||||||
void Warning(string Message, Scene scene);
|
void Warning(string Message, Scene scene);
|
||||||
void Major(string Message, Scene scene);
|
void Major(string Message, Scene scene);
|
||||||
void ColdStart(int step , Scene scene);
|
void ColdStart(int step , Scene scene);
|
||||||
|
|
Loading…
Reference in New Issue