OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Temporary fix for a missing Opensim.ini file.

afrisby
MW 2007-10-26 15:00:35 +00:00
parent 070047ce1b
commit 5b8c31c3bd
2 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
OpenSim/Region/Application/Application.cs
View File

@ -67,6 +67,9 @@ namespace OpenSim
configSource.AddSwitch("Startup", "verbose"); configSource.AddSwitch("Startup", "verbose");
configSource.AddSwitch("Startup", "useexecutepath"); configSource.AddSwitch("Startup", "useexecutepath");
configSource.AddConfig("StandAlone");
configSource.AddConfig("Network");
OpenSimMain sim = new OpenSimMain(configSource); OpenSimMain sim = new OpenSimMain(configSource);
sim.StartUp(); sim.StartUp();

10
OpenSim/Region/Application/OpenSimMain.cs
View File

@ -110,10 +110,6 @@ namespace OpenSim
if (File.Exists(iniFilePath)) if (File.Exists(iniFilePath))
{ {
m_config = new IniConfigSource(iniFilePath); m_config = new IniConfigSource(iniFilePath);
//enable following line, if we want the original config source(normally commandline args) merged with ini file settings.
//in this case we have it so that if both sources have the same named setting, the command line value will overwrite the ini file value.
//(as if someone has bothered to enter a command line arg, we should take notice of it)
m_config.Merge(configSource); m_config.Merge(configSource);
} }
else else
@ -145,12 +141,6 @@ namespace OpenSim
m_scriptEngine = startupConfig.GetString("script_engine", "DotNetEngine"); m_scriptEngine = startupConfig.GetString("script_engine", "DotNetEngine");
m_assetStorage = startupConfig.GetString("asset_database", "db4o"); m_assetStorage = startupConfig.GetString("asset_database", "db4o");
// wtf?
startupConfig.GetBoolean("default_modules", true);
startupConfig.GetBoolean("default_shared_modules", true);
startupConfig.GetString("except_modules", "");
startupConfig.GetString("except_shared_modules", "");
} }
IConfig standaloneConfig = m_config.Configs["StandAlone"]; IConfig standaloneConfig = m_config.Configs["StandAlone"];