diff options
author | Justin Clarke Casey | 2008-10-03 15:41:27 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-10-03 15:41:27 +0000 |
commit | 3ffd77f70b1ca84de823070cdf2a8925b7b81ca3 (patch) | |
tree | a8213d21fafddd78449e04d525ebd74137543275 /OpenSim | |
parent | Implement temp-on-rez objecte really being temporary (diff) | |
download | opensim-SC-3ffd77f70b1ca84de823070cdf2a8925b7b81ca3.zip opensim-SC-3ffd77f70b1ca84de823070cdf2a8925b7b81ca3.tar.gz opensim-SC-3ffd77f70b1ca84de823070cdf2a8925b7b81ca3.tar.bz2 opensim-SC-3ffd77f70b1ca84de823070cdf2a8925b7b81ca3.tar.xz |
* oops, fix region startup to be in the correct sequence (though it appeared to work anyway)
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/Servers/BaseOpenSimServer.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Application/OpenSim.cs | 4 |
2 files changed, 3 insertions, 3 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 | |||
217 | 217 | ||
218 | TimeSpan timeTaken = DateTime.Now - m_startuptime; | 218 | TimeSpan timeTaken = DateTime.Now - m_startuptime; |
219 | 219 | ||
220 | m_log.InfoFormat("[STARTUP]: Server startup took {0}m {1}s", timeTaken.Minutes, timeTaken.Seconds); | 220 | m_log.InfoFormat("[STARTUP]: STARTUP COMPLETE - took {0}m {1}s", timeTaken.Minutes, timeTaken.Seconds); |
221 | } | 221 | } |
222 | 222 | ||
223 | /// <summary> | 223 | /// <summary> |
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 | |||
84 | /// <summary> | 84 | /// <summary> |
85 | /// Performs initialisation of the scene, such as loading configuration from disk. | 85 | /// Performs initialisation of the scene, such as loading configuration from disk. |
86 | /// </summary> | 86 | /// </summary> |
87 | public override void Startup() | 87 | protected override void StartupSpecific() |
88 | { | 88 | { |
89 | m_log.Info("===================================================================="); | 89 | m_log.Info("===================================================================="); |
90 | m_log.Info("========================= STARTING OPENSIM ========================="); | 90 | m_log.Info("========================= STARTING OPENSIM ========================="); |
@@ -94,7 +94,7 @@ namespace OpenSim | |||
94 | m_console = new ConsoleBase("Region", this); | 94 | m_console = new ConsoleBase("Region", this); |
95 | MainConsole.Instance = m_console; | 95 | MainConsole.Instance = m_console; |
96 | 96 | ||
97 | base.Startup(); | 97 | base.StartupSpecific(); |
98 | 98 | ||
99 | //Run Startup Commands | 99 | //Run Startup Commands |
100 | if (String.IsNullOrEmpty( m_startupCommandsFile )) | 100 | if (String.IsNullOrEmpty( m_startupCommandsFile )) |