diff options
author | Dr Scofield | 2009-04-16 12:10:50 +0000 |
---|---|---|
committer | Dr Scofield | 2009-04-16 12:10:50 +0000 |
commit | bd2ca2d9c1a8ea958255f1f8e9b31c46754cce26 (patch) | |
tree | 0a792cedcde02fbf7c017b0a8a0c4a6bf0b14f5b /OpenSim | |
parent | move inclusion of Makefile.local to the end to avoid surprising results (diff) | |
download | opensim-SC_OLD-bd2ca2d9c1a8ea958255f1f8e9b31c46754cce26.zip opensim-SC_OLD-bd2ca2d9c1a8ea958255f1f8e9b31c46754cce26.tar.gz opensim-SC_OLD-bd2ca2d9c1a8ea958255f1f8e9b31c46754cce26.tar.bz2 opensim-SC_OLD-bd2ca2d9c1a8ea958255f1f8e9b31c46754cce26.tar.xz |
- turn private m_gui into protected m_gui to allow manipulation in
derived classes
- make OpenSimBackground inherit from OpenSim instead of OpenSimBase
so that it will have a MainConsole instance and we can use console
commands, setting m_gui to false
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Application/OpenSim.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Application/OpenSimBackground.cs | 13 |
2 files changed, 3 insertions, 12 deletions
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs index 8ebf144..bafa736 100644 --- a/OpenSim/Region/Application/OpenSim.cs +++ b/OpenSim/Region/Application/OpenSim.cs | |||
@@ -51,10 +51,10 @@ namespace OpenSim | |||
51 | 51 | ||
52 | protected string m_startupCommandsFile; | 52 | protected string m_startupCommandsFile; |
53 | protected string m_shutdownCommandsFile; | 53 | protected string m_shutdownCommandsFile; |
54 | protected bool m_gui = false; | ||
54 | 55 | ||
55 | private string m_timedScript = "disabled"; | 56 | private string m_timedScript = "disabled"; |
56 | private Timer m_scriptTimer; | 57 | private Timer m_scriptTimer; |
57 | private bool m_gui = false; | ||
58 | 58 | ||
59 | public OpenSim(IConfigSource configSource) : base(configSource) | 59 | public OpenSim(IConfigSource configSource) : base(configSource) |
60 | { | 60 | { |
diff --git a/OpenSim/Region/Application/OpenSimBackground.cs b/OpenSim/Region/Application/OpenSimBackground.cs index 93999ce..16c244a 100644 --- a/OpenSim/Region/Application/OpenSimBackground.cs +++ b/OpenSim/Region/Application/OpenSimBackground.cs | |||
@@ -35,7 +35,7 @@ namespace OpenSim | |||
35 | /// <summary> | 35 | /// <summary> |
36 | /// Consoleless OpenSim region server | 36 | /// Consoleless OpenSim region server |
37 | /// </summary> | 37 | /// </summary> |
38 | public class OpenSimBackground : OpenSimBase | 38 | public class OpenSimBackground : OpenSim |
39 | { | 39 | { |
40 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 40 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
41 | 41 | ||
@@ -50,18 +50,10 @@ namespace OpenSim | |||
50 | /// </summary> | 50 | /// </summary> |
51 | public override void Startup() | 51 | public override void Startup() |
52 | { | 52 | { |
53 | // | 53 | m_gui = false; |
54 | // Called from app startup (OpenSim.Application) | ||
55 | // | ||
56 | m_log.Info("===================================================================="); | ||
57 | m_log.Info("========================= STARTING OPENSIM ========================="); | ||
58 | m_log.Info("===================================================================="); | ||
59 | m_log.InfoFormat("[OPENSIM MAIN]: Running in background {0} mode", | ||
60 | ConfigurationSettings.Standalone ? "sandbox" : "grid"); | ||
61 | 54 | ||
62 | base.Startup(); | 55 | base.Startup(); |
63 | 56 | ||
64 | // We are done with startup | ||
65 | m_log.InfoFormat("[OPENSIM MAIN]: Startup complete, serving {0} region{1}", | 57 | m_log.InfoFormat("[OPENSIM MAIN]: Startup complete, serving {0} region{1}", |
66 | m_clientServers.Count.ToString(), m_clientServers.Count > 1 ? "s" : ""); | 58 | m_clientServers.Count.ToString(), m_clientServers.Count > 1 ? "s" : ""); |
67 | 59 | ||
@@ -74,7 +66,6 @@ namespace OpenSim | |||
74 | public override void Shutdown() | 66 | public override void Shutdown() |
75 | { | 67 | { |
76 | WorldHasComeToAnEnd.Set(); | 68 | WorldHasComeToAnEnd.Set(); |
77 | |||
78 | base.Shutdown(); | 69 | base.Shutdown(); |
79 | } | 70 | } |
80 | } | 71 | } |