diff options
author | Justin Clarke Casey | 2008-06-01 01:34:46 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-06-01 01:34:46 +0000 |
commit | 15d41c2fc279f369f1f95e886ebaada94f558dcc (patch) | |
tree | b0265e63d29aeed628f6d44aff1e990188073af1 /OpenSim/Region/Application/OpenSim.cs | |
parent | * Put IScenePermissions out of its misery (diff) | |
download | opensim-SC-15d41c2fc279f369f1f95e886ebaada94f558dcc.zip opensim-SC-15d41c2fc279f369f1f95e886ebaada94f558dcc.tar.gz opensim-SC-15d41c2fc279f369f1f95e886ebaada94f558dcc.tar.bz2 opensim-SC-15d41c2fc279f369f1f95e886ebaada94f558dcc.tar.xz |
* Fix build break by eliminating remaining IScenePermissions references - must remember to nant clean
* Hook all server startups into base opensim server startup method
Diffstat (limited to 'OpenSim/Region/Application/OpenSim.cs')
-rw-r--r-- | OpenSim/Region/Application/OpenSim.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs index 1996182..b020a6c 100644 --- a/OpenSim/Region/Application/OpenSim.cs +++ b/OpenSim/Region/Application/OpenSim.cs | |||
@@ -80,7 +80,7 @@ namespace OpenSim | |||
80 | /// <summary> | 80 | /// <summary> |
81 | /// Performs initialisation of the scene, such as loading configuration from disk. | 81 | /// Performs initialisation of the scene, such as loading configuration from disk. |
82 | /// </summary> | 82 | /// </summary> |
83 | public override void StartUp() | 83 | public override void Startup() |
84 | { | 84 | { |
85 | m_log.Info("===================================================================="); | 85 | m_log.Info("===================================================================="); |
86 | m_log.Info("========================= STARTING OPENSIM ========================="); | 86 | m_log.Info("========================= STARTING OPENSIM ========================="); |
@@ -90,7 +90,7 @@ namespace OpenSim | |||
90 | m_console = CreateConsole(); | 90 | m_console = CreateConsole(); |
91 | MainConsole.Instance = m_console; | 91 | MainConsole.Instance = m_console; |
92 | 92 | ||
93 | base.StartUp(); | 93 | base.Startup(); |
94 | 94 | ||
95 | //Run Startup Commands | 95 | //Run Startup Commands |
96 | if (m_startupCommandsFile != String.Empty) | 96 | if (m_startupCommandsFile != String.Empty) |