aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application
diff options
context:
space:
mode:
authorMelanie Thielker2009-02-10 12:25:29 +0000
committerMelanie Thielker2009-02-10 12:25:29 +0000
commita1393db7f0cb542f10f52ac739c78f15ee28ce77 (patch)
tree4b4349f350255103d0073fce34a2d80d7d66e389 /OpenSim/Region/Application
parentCommented out a problematic test that needs more careful revision. (diff)
downloadopensim-SC-a1393db7f0cb542f10f52ac739c78f15ee28ce77.zip
opensim-SC-a1393db7f0cb542f10f52ac739c78f15ee28ce77.tar.gz
opensim-SC-a1393db7f0cb542f10f52ac739c78f15ee28ce77.tar.bz2
opensim-SC-a1393db7f0cb542f10f52ac739c78f15ee28ce77.tar.xz
Stopgap measure: To use gridlaunch, or GUI, start opensim with
OpenSim.exe -gui=true
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Application/Application.cs2
-rw-r--r--OpenSim/Region/Application/OpenSim.cs4
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
84 configSource.AddSwitch("Startup", "physics"); 84 configSource.AddSwitch("Startup", "physics");
85 configSource.AddSwitch("Startup", "useexecutepath"); 85 configSource.AddSwitch("Startup", "useexecutepath");
86 configSource.AddSwitch("Startup", "hypergrid"); 86 configSource.AddSwitch("Startup", "hypergrid");
87 configSource.AddSwitch("Startup", "gui");
87 88
88 configSource.AddConfig("StandAlone"); 89 configSource.AddConfig("StandAlone");
89 configSource.AddConfig("Network"); 90 configSource.AddConfig("Network");
90 91
91 bool background = configSource.Configs["Startup"].GetBoolean("background", false); 92 bool background = configSource.Configs["Startup"].GetBoolean("background", false);
92 bool hgrid = configSource.Configs["Startup"].GetBoolean("hypergrid", false); 93 bool hgrid = configSource.Configs["Startup"].GetBoolean("hypergrid", false);
93
94 m_saveCrashDumps = configSource.Configs["Startup"].GetBoolean("save_crashes", false); 94 m_saveCrashDumps = configSource.Configs["Startup"].GetBoolean("save_crashes", false);
95 m_crashDir = configSource.Configs["Startup"].GetString("crash_dir", m_crashDir); 95 m_crashDir = configSource.Configs["Startup"].GetString("crash_dir", m_crashDir);
96 96
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
58 58
59 private string m_timedScript = "disabled"; 59 private string m_timedScript = "disabled";
60 private Timer m_scriptTimer; 60 private Timer m_scriptTimer;
61 private bool m_gui = false;
61 62
62 public OpenSim(IConfigSource configSource) : base(configSource) 63 public OpenSim(IConfigSource configSource) : base(configSource)
63 { 64 {
@@ -74,6 +75,8 @@ namespace OpenSim
74 m_startupCommandsFile = startupConfig.GetString("startup_console_commands_file", String.Empty); 75 m_startupCommandsFile = startupConfig.GetString("startup_console_commands_file", String.Empty);
75 m_shutdownCommandsFile = startupConfig.GetString("shutdown_console_commands_file", String.Empty); 76 m_shutdownCommandsFile = startupConfig.GetString("shutdown_console_commands_file", String.Empty);
76 77
78 m_gui = startupConfig.GetBoolean("gui", false);
79
77 m_timedScript = startupConfig.GetString("timer_Script", "disabled"); 80 m_timedScript = startupConfig.GetString("timer_Script", "disabled");
78 } 81 }
79 } 82 }
@@ -93,6 +96,7 @@ namespace OpenSim
93 //m_log.InfoFormat("[OPENSIM MAIN]: GC Latency Mode: {0}", GCSettings.LatencyMode.ToString()); 96 //m_log.InfoFormat("[OPENSIM MAIN]: GC Latency Mode: {0}", GCSettings.LatencyMode.ToString());
94 97
95 m_console = new ConsoleBase("Region"); 98 m_console = new ConsoleBase("Region");
99 m_console.SetGuiMode(m_gui);
96 MainConsole.Instance = m_console; 100 MainConsole.Instance = m_console;
97 101
98 m_console.Commands.AddCommand("region", "clear assets", 102 m_console.Commands.AddCommand("region", "clear assets",