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:
diva
2009-04-27 00:16:59 +00:00
parent 1ce362323e
commit d8313e314f
6 changed files with 53 additions and 81 deletions

View File

@@ -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();