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

Output an error and quit if the master file is missing. Also rename

Browse Source 
OpenSim.ini.example to bin/OpenSimDefaults.ini.example
This commit is contained in:
Melanie
2010-09-13 23:17:42 +01:00
parent 8febba7717
commit 2cf98e77fc
2 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
OpenSim/Region/Application/ConfigurationLoader.cs
View File

@@ -85,6 +85,9 @@ namespace OpenSim
string masterFileName =
startupConfig.GetString("inimaster", "OpenSimDefaults.ini");
if (masterFileName == "none")
masterFileName = String.Empty;
if (IsUri(masterFileName))
{
if (!sources.Contains(masterFileName))
@@ -95,10 +98,19 @@ namespace OpenSim
string masterFilePath = Path.GetFullPath(
Path.Combine(Util.configDir(), masterFileName));
if (masterFileName != String.Empty &&
File.Exists(masterFilePath) &&
(!sources.Contains(masterFilePath)))
sources.Add(masterFilePath);
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", masterFilePath);
Environment.Exit(1);
}
}
}