- 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

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
 
         protected string m_startupCommandsFile;
         protected string m_shutdownCommandsFile;
+        protected bool m_gui = false;
 
         private string m_timedScript = "disabled";
         private Timer m_scriptTimer;
-        private bool m_gui = false;
 
         public OpenSim(IConfigSource configSource) : base(configSource)
         {
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
     /// <summary>
     /// Consoleless OpenSim region server
     /// </summary>
-    public class OpenSimBackground : OpenSimBase
+    public class OpenSimBackground : OpenSim
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
@@ -50,18 +50,10 @@ namespace OpenSim
         /// </summary>
         public override void Startup()
         {
-            //
-            // Called from app startup (OpenSim.Application)
-            //
-            m_log.Info("====================================================================");
-            m_log.Info("========================= STARTING OPENSIM =========================");
-            m_log.Info("====================================================================");
-            m_log.InfoFormat("[OPENSIM MAIN]: Running in background {0} mode",
-                             ConfigurationSettings.Standalone ? "sandbox" : "grid");
+            m_gui = false;
 
             base.Startup();
 
-            // We are done with startup
             m_log.InfoFormat("[OPENSIM MAIN]: Startup complete, serving {0} region{1}",
                              m_clientServers.Count.ToString(), m_clientServers.Count > 1 ? "s" : "");
 
@@ -74,7 +66,6 @@ namespace OpenSim
         public override void Shutdown()
         {
             WorldHasComeToAnEnd.Set();
-
             base.Shutdown();
         }
     }