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

Merge branch 'master' into careminster-presence-refactor

Browse Source
This commit is contained in:
Melanie
2011-01-29 04:47:32 +00:00
parent 87ed39c953 8f008f394d
commit 24a768a99b
12 changed files with 723 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -179,8 +179,10 @@ namespace OpenSim
for (int i = 0 ; i < sources.Count ; i++)
{
if (ReadConfig(sources[i]))
{
iniFileExists = true;
AddIncludes(sources);
AddIncludes(sources);
}
}
if (!iniFileExists)
@@ -235,10 +237,19 @@ namespace OpenSim
string path = Path.Combine(basepath, chunkWithoutWildcards);
path = Path.GetFullPath(path) + chunkWithWildcards;
string[] paths = Util.Glob(path);
foreach (string p in paths)
// If the include path contains no wildcards, then warn the user that it wasn't found.
if (wildcardIndex == -1 && paths.Length == 0)
{
if (!sources.Contains(p))
sources.Add(p);
m_log.WarnFormat("[CONFIG]: Could not find include file {0}", path);
}
else
{
foreach (string p in paths)
{
if (!sources.Contains(p))
sources.Add(p);
}
}
}
}