From 3ffd77f70b1ca84de823070cdf2a8925b7b81ca3 Mon Sep 17 00:00:00 2001 From: Justin Clarke Casey Date: Fri, 3 Oct 2008 15:41:27 +0000 Subject: * oops, fix region startup to be in the correct sequence (though it appeared to work anyway) --- OpenSim/Framework/Servers/BaseOpenSimServer.cs | 2 +- OpenSim/Region/Application/OpenSim.cs | 4 ++-- bin/startuplogo.txt | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs index 8f103e1..cc255b2 100644 --- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs +++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs @@ -217,7 +217,7 @@ namespace OpenSim.Framework.Servers 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); } /// diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs index 1e2b8a5..748edbb 100644 --- a/OpenSim/Region/Application/OpenSim.cs +++ b/OpenSim/Region/Application/OpenSim.cs @@ -84,7 +84,7 @@ namespace OpenSim /// /// Performs initialisation of the scene, such as loading configuration from disk. /// - public override void Startup() + protected override void StartupSpecific() { m_log.Info("===================================================================="); m_log.Info("========================= STARTING OPENSIM ========================="); @@ -94,7 +94,7 @@ namespace OpenSim m_console = new ConsoleBase("Region", this); MainConsole.Instance = m_console; - base.Startup(); + base.StartupSpecific(); //Run Startup Commands if (String.IsNullOrEmpty( m_startupCommandsFile )) diff --git a/bin/startuplogo.txt b/bin/startuplogo.txt index 08d0edd..8b13789 100644 --- a/bin/startuplogo.txt +++ b/bin/startuplogo.txt @@ -1 +1 @@ -STARTUP COMPLETE \ No newline at end of file + -- cgit v1.1