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

Merge branch 'master' of opensimulator.org:/var/git/opensim

LSLKeyTest
UbitUmarov 2015-12-25 10:44:59 +00:00
parent b7ea5c4967 52ebb3f2fb
commit e5f7856eaf
2 changed files with 36 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -70,6 +70,36 @@ namespace OpenSim.Tools.Configger
List<string> sources = new List<string>();
string masterFileName = startupConfig.GetString("inimaster", "OpenSimDefaults.ini");
if (masterFileName == "none")
masterFileName = String.Empty;
if (IsUri(masterFileName))
{
if (!sources.Contains(masterFileName))
sources.Add(masterFileName);
}
else
{
string masterFilePath = Path.GetFullPath(
Path.Combine(Util.configDir(), masterFileName));
if (masterFileName != String.Empty)
{
if (File.Exists(masterFilePath))
{
if (!sources.Contains(masterFilePath))
sources.Add(masterFilePath);
}
else
{
m_log.ErrorFormat("Master ini file {0} not found", Path.GetFullPath(masterFilePath));
Environment.Exit(1);
}
}
}
string iniFileName = startupConfig.GetString("inifile", Path.Combine(".", "OpenSim.ini"));
if (IsUri(iniFileName))

6
OpenSim/Tools/Configger/Util.cs
View File

@ -102,5 +102,11 @@ namespace OpenSim.Tools.Configger
return found.ToArray();
}
public static string configDir()
{
return ".";
}
}
}