* oops, fix region startup to be in the correct sequence (though it appeared to work anyway)
parent
3902149e1b
commit
3ffd77f70b
|
@ -217,7 +217,7 @@ namespace OpenSim.Framework.Servers
|
||||||
|
|
||||||
TimeSpan timeTaken = DateTime.Now - m_startuptime;
|
TimeSpan timeTaken = DateTime.Now - m_startuptime;
|
||||||
|
|
||||||
m_log.InfoFormat("[STARTUP]: Server startup took {0}m {1}s", timeTaken.Minutes, timeTaken.Seconds);
|
m_log.InfoFormat("[STARTUP]: STARTUP COMPLETE - took {0}m {1}s", timeTaken.Minutes, timeTaken.Seconds);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|
|
@ -84,7 +84,7 @@ namespace OpenSim
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Performs initialisation of the scene, such as loading configuration from disk.
|
/// Performs initialisation of the scene, such as loading configuration from disk.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public override void Startup()
|
protected override void StartupSpecific()
|
||||||
{
|
{
|
||||||
m_log.Info("====================================================================");
|
m_log.Info("====================================================================");
|
||||||
m_log.Info("========================= STARTING OPENSIM =========================");
|
m_log.Info("========================= STARTING OPENSIM =========================");
|
||||||
|
@ -94,7 +94,7 @@ namespace OpenSim
|
||||||
m_console = new ConsoleBase("Region", this);
|
m_console = new ConsoleBase("Region", this);
|
||||||
MainConsole.Instance = m_console;
|
MainConsole.Instance = m_console;
|
||||||
|
|
||||||
base.Startup();
|
base.StartupSpecific();
|
||||||
|
|
||||||
//Run Startup Commands
|
//Run Startup Commands
|
||||||
if (String.IsNullOrEmpty( m_startupCommandsFile ))
|
if (String.IsNullOrEmpty( m_startupCommandsFile ))
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
STARTUP COMPLETE
|
|
||||||
|
|
Loading…
Reference in New Issue