mirror of
https://github.com/opensim/opensim.git
synced 2026-08-09 18:55:58 +08:00
Getting rid of -hypergrid=true on the command line. This config now goes inside OpenSim.ini in the Startup section. This makes the HG compatible with -background, and prepares the way for further work on HG-related config vars. Might help with mantis #3527.
This commit is contained in:
@@ -94,14 +94,12 @@ namespace OpenSim
|
||||
configSource.AddSwitch("Startup", "inidirectory");
|
||||
configSource.AddSwitch("Startup", "gridmode");
|
||||
configSource.AddSwitch("Startup", "physics");
|
||||
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);
|
||||
|
||||
@@ -112,11 +110,7 @@ namespace OpenSim
|
||||
}
|
||||
else
|
||||
{
|
||||
m_sim = null;
|
||||
if (hgrid)
|
||||
m_sim = new HGOpenSimNode(configSource);
|
||||
else
|
||||
m_sim = new OpenSim(configSource);
|
||||
m_sim = new OpenSim(configSource);
|
||||
|
||||
m_sim.Startup();
|
||||
|
||||
|
||||
Reference in New Issue
Block a user