aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-10-03 15:41:27 +0000
committerJustin Clarke Casey2008-10-03 15:41:27 +0000
commit3ffd77f70b1ca84de823070cdf2a8925b7b81ca3 (patch)
treea8213d21fafddd78449e04d525ebd74137543275 /OpenSim/Region/Application
parentImplement temp-on-rez objecte really being temporary (diff)
downloadopensim-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 'OpenSim/Region/Application')
-rw-r--r--OpenSim/Region/Application/OpenSim.cs4
1 files changed, 2 insertions, 2 deletions
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 ))