aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-06-01 01:34:46 +0000
committerJustin Clarke Casey2008-06-01 01:34:46 +0000
commit15d41c2fc279f369f1f95e886ebaada94f558dcc (patch)
treeb0265e63d29aeed628f6d44aff1e990188073af1 /OpenSim/Region/Application
parent* Put IScenePermissions out of its misery (diff)
downloadopensim-SC_OLD-15d41c2fc279f369f1f95e886ebaada94f558dcc.zip
opensim-SC_OLD-15d41c2fc279f369f1f95e886ebaada94f558dcc.tar.gz
opensim-SC_OLD-15d41c2fc279f369f1f95e886ebaada94f558dcc.tar.bz2
opensim-SC_OLD-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 '')
-rw-r--r--OpenSim/Region/Application/Application.cs4
-rw-r--r--OpenSim/Region/Application/OpenSim.cs4
-rw-r--r--OpenSim/Region/Application/OpenSimBackground.cs4
-rw-r--r--OpenSim/Region/Application/OpenSimBase.cs4
4 files changed, 8 insertions, 8 deletions
diff --git a/OpenSim/Region/Application/Application.cs b/OpenSim/Region/Application/Application.cs
index 72fdf10..9be30e9 100644
--- a/OpenSim/Region/Application/Application.cs
+++ b/OpenSim/Region/Application/Application.cs
@@ -83,12 +83,12 @@ namespace OpenSim
83 if (background) 83 if (background)
84 { 84 {
85 OpenSimBase sim = new OpenSimBackground(configSource); 85 OpenSimBase sim = new OpenSimBackground(configSource);
86 sim.StartUp(); 86 sim.Startup();
87 } 87 }
88 else 88 else
89 { 89 {
90 OpenSimBase sim = new OpenSim(configSource); 90 OpenSimBase sim = new OpenSim(configSource);
91 sim.StartUp(); 91 sim.Startup();
92 92
93 while (true) 93 while (true)
94 { 94 {
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)
diff --git a/OpenSim/Region/Application/OpenSimBackground.cs b/OpenSim/Region/Application/OpenSimBackground.cs
index dd618f0..51a5b67 100644
--- a/OpenSim/Region/Application/OpenSimBackground.cs
+++ b/OpenSim/Region/Application/OpenSimBackground.cs
@@ -48,7 +48,7 @@ namespace OpenSim
48 /// <summary> 48 /// <summary>
49 /// Performs initialisation of the scene, such as loading configuration from disk. 49 /// Performs initialisation of the scene, such as loading configuration from disk.
50 /// </summary> 50 /// </summary>
51 public override void StartUp() 51 public override void Startup()
52 { 52 {
53 // 53 //
54 // Called from app startup (OpenSim.Application) 54 // Called from app startup (OpenSim.Application)
@@ -58,7 +58,7 @@ namespace OpenSim
58 m_log.Info("===================================================================="); 58 m_log.Info("====================================================================");
59 m_log.InfoFormat("[OPENSIM MAIN]: Running in background {0} mode", m_sandbox ? "sandbox" : "grid"); 59 m_log.InfoFormat("[OPENSIM MAIN]: Running in background {0} mode", m_sandbox ? "sandbox" : "grid");
60 60
61 base.StartUp(); 61 base.Startup();
62 62
63 // We are done with startup 63 // We are done with startup
64 m_log.InfoFormat("[OPENSIM MAIN]: Startup complete, serving {0} region{1}", 64 m_log.InfoFormat("[OPENSIM MAIN]: Startup complete, serving {0} region{1}",
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index 3e4db41..f96c29b 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -330,9 +330,9 @@ namespace OpenSim
330 /// <summary> 330 /// <summary>
331 /// Performs initialisation of the scene, such as loading configuration from disk. 331 /// Performs initialisation of the scene, such as loading configuration from disk.
332 /// </summary> 332 /// </summary>
333 public override void StartUp() 333 public override void Startup()
334 { 334 {
335 base.StartUp(); 335 base.Startup();
336 336
337 m_stats = StatsManager.StartCollectingSimExtraStats(); 337 m_stats = StatsManager.StartCollectingSimExtraStats();
338 338