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

Remove GetFullPath call from config includes, because it barfs in Windoze

arthursv
Melanie 2009-08-07 20:51:07 +01:00
parent 4ee8d8a813
commit d10f157183
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
OpenSim/Framework/Util.cs
View File

@ -1155,10 +1155,7 @@ namespace OpenSim.Framework
string[] files = Directory.GetFiles(p, c); string[] files = Directory.GetFiles(p, c);
foreach (string f in files) foreach (string f in files)
{
m_log.InfoFormat("Adding file {0} to include list", f);
found.Add(f); found.Add(f);
}
} }
paths = addpaths; paths = addpaths;
} }

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

@ -187,8 +187,7 @@ namespace OpenSim
else else
{ {
m_log.InfoFormat("Adding {0} to configuration", Path.Combine(Util.configDir(), file)); m_log.InfoFormat("Adding {0} to configuration", Path.Combine(Util.configDir(), file));
string path = Path.GetFullPath( string path = Path.Combine(Util.configDir(), file);
Path.Combine(Util.configDir(), file));
string[] paths = Util.Glob(path); string[] paths = Util.Glob(path);
foreach (string p in paths) foreach (string p in paths)
{ {