ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-08 02:05:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

* Fix build break by eliminating remaining IScenePermissions references - must remember to nant clean

Browse Source 
* Hook all server startups into base opensim server startup method
This commit is contained in:
Justin Clarke Casey
2008-06-01 01:34:46 +00:00
parent 0392b4fdc3
commit 15d41c2fc2
12 changed files with 26 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Region/Application/Application.cs
View File

@@ -83,12 +83,12 @@ namespace OpenSim
if (background)
{
OpenSimBase sim = new OpenSimBackground(configSource);
sim.StartUp();
sim.Startup();
}
else
{
OpenSimBase sim = new OpenSim(configSource);
sim.StartUp();
sim.Startup();
while (true)
{

4
OpenSim/Region/Application/OpenSim.cs
View File

@@ -80,7 +80,7 @@ namespace OpenSim
/// <summary>
/// Performs initialisation of the scene, such as loading configuration from disk.
/// </summary>
public override void StartUp()
public override void Startup()
{
m_log.Info("====================================================================");
m_log.Info("========================= STARTING OPENSIM =========================");
@@ -90,7 +90,7 @@ namespace OpenSim
m_console = CreateConsole();
MainConsole.Instance = m_console;
base.StartUp();
base.Startup();
//Run Startup Commands
if (m_startupCommandsFile != String.Empty)

4
OpenSim/Region/Application/OpenSimBackground.cs
View File

@@ -48,7 +48,7 @@ namespace OpenSim
/// <summary>
/// Performs initialisation of the scene, such as loading configuration from disk.
/// </summary>
public override void StartUp()
public override void Startup()
{
//
// Called from app startup (OpenSim.Application)
@@ -58,7 +58,7 @@ namespace OpenSim
m_log.Info("====================================================================");
m_log.InfoFormat("[OPENSIM MAIN]: Running in background {0} mode", m_sandbox ? "sandbox" : "grid");
base.StartUp();
base.Startup();
// We are done with startup
m_log.InfoFormat("[OPENSIM MAIN]: Startup complete, serving {0} region{1}",

4
OpenSim/Region/Application/OpenSimBase.cs
View File

@@ -330,9 +330,9 @@ namespace OpenSim
/// <summary>
/// Performs initialisation of the scene, such as loading configuration from disk.
/// </summary>
public override void StartUp()
public override void Startup()
{
base.StartUp();
base.Startup();
m_stats = StatsManager.StartCollectingSimExtraStats();