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

Allow Tools.Configger to take -inifile as argument

Browse Source
This commit is contained in:
Diva Canto
2014-05-07 16:59:11 -07:00
parent 13b2ac1425
commit 3db9b847bf
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
OpenSim/Tools/Configger/ConfigurationLoader.cs
View File

@@ -64,14 +64,14 @@ namespace OpenSim.Tools.Configger
/// <param name="configSettings"></param>
/// <param name="networkInfo"></param>
/// <returns>A configuration that gets passed to modules</returns>
public IConfigSource LoadConfigSettings()
public IConfigSource LoadConfigSettings(IConfig startupConfig)
{
bool iniFileExists = false;
List<string> sources = new List<string>();
string iniFileName = "OpenSim.ini";
string iniFilePath = Path.Combine(".", iniFileName);
string iniFileName = startupConfig.GetString("inifile", Path.Combine(".", "OpenSim.ini"));
Console.WriteLine("---> " + iniFileName + " <---");
if (IsUri(iniFileName))
{
@@ -80,10 +80,10 @@ namespace OpenSim.Tools.Configger
}
else
{
if (File.Exists(iniFilePath))
if (File.Exists(iniFileName))
{
if (!sources.Contains(iniFilePath))
sources.Add(iniFilePath);
if (!sources.Contains(iniFileName))
sources.Add(iniFileName);
}
}