2 files changed, 5 insertions, 1 deletions

diff --git a/OpenSim/Region/Application/Application.cs b/OpenSim/Region/Application/Application.cs
index 7a427dc..b9e82a4 100644
--- a/OpenSim/Region/Application/Application.cs
+++ b/OpenSim/Region/Application/Application.cs
@@ -84,13 +84,13 @@ namespace OpenSim
             configSource.AddSwitch("Startup", "physics");
             configSource.AddSwitch("Startup", "useexecutepath");
             configSource.AddSwitch("Startup", "hypergrid");
+            configSource.AddSwitch("Startup", "gui");
 
             configSource.AddConfig("StandAlone");
             configSource.AddConfig("Network");
 
             bool background = configSource.Configs["Startup"].GetBoolean("background", false);
             bool hgrid = configSource.Configs["Startup"].GetBoolean("hypergrid", false);
-
             m_saveCrashDumps = configSource.Configs["Startup"].GetBoolean("save_crashes", false);
             m_crashDir = configSource.Configs["Startup"].GetString("crash_dir", m_crashDir);
 
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index d706e05..1c7751d 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -58,6 +58,7 @@ namespace OpenSim
 
         private string m_timedScript = "disabled";
         private Timer m_scriptTimer;
+        private bool m_gui = false;
 
         public OpenSim(IConfigSource configSource) : base(configSource)
         {
@@ -74,6 +75,8 @@ namespace OpenSim
                 m_startupCommandsFile = startupConfig.GetString("startup_console_commands_file", String.Empty);
                 m_shutdownCommandsFile = startupConfig.GetString("shutdown_console_commands_file", String.Empty);
 
+                m_gui = startupConfig.GetBoolean("gui", false);
+
                 m_timedScript = startupConfig.GetString("timer_Script", "disabled");
             }
         }
@@ -93,6 +96,7 @@ namespace OpenSim
             //m_log.InfoFormat("[OPENSIM MAIN]: GC Latency Mode: {0}", GCSettings.LatencyMode.ToString());
 
             m_console = new ConsoleBase("Region");
+            m_console.SetGuiMode(m_gui);
             MainConsole.Instance = m_console;
 
             m_console.Commands.AddCommand("region", "clear assets",