ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-11 20:05:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

*Replaced -useexecutepath with an updated -inifile extension. You can now specify either a filename (will use the default config path, or you can specify a full path.

Browse Source
This commit is contained in:
mingchen
2007-10-28 03:41:34 +00:00
parent fb6aa6eafc
commit d56da1c831
2 changed files with 15 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -95,20 +95,10 @@ namespace OpenSim
{
IConfig startupConfig = configSource.Configs["Startup"];
string iniFile = startupConfig.GetString("inifile", "OpenSim.ini");
string useExecutePathString = startupConfig.GetString("useexecutepath", "false").ToLower();
bool useExecutePath = false;
if (useExecutePathString == "true" || useExecutePathString == "" || useExecutePathString == "1" || useExecutePathString == "yes")
{
useExecutePath = true;
}
Util.changeUseExecutePathSetting(useExecutePath);
string iniFilePath = startupConfig.GetString("inifile", "OpenSim.ini");
m_config = new IniConfigSource();
//check for .INI file (either default or name passed in command line)
string iniFilePath = Path.Combine(Util.configDir(), iniFile);
if (File.Exists(iniFilePath))
{
m_config.Merge(new IniConfigSource(iniFilePath));
@@ -116,12 +106,22 @@ namespace OpenSim
}
else
{
// no default config files, so set default values, and save it
SetDefaultConfig();
iniFilePath = Path.Combine(Util.configDir(), iniFilePath);
if (File.Exists(iniFilePath))
{
m_config.Merge(new IniConfigSource(iniFilePath));
m_config.Merge(configSource);
}
else
{
m_config.Merge(configSource);
// no default config files, so set default values, and save it
SetDefaultConfig();
m_config.Save(iniFilePath);
m_config.Merge(configSource);
m_config.Save(iniFilePath);
}
}
ReadConfigSettings();