From d10f1571831895fbdd0a818bf34590087078643a Mon Sep 17 00:00:00 2001 From: Melanie Date: Fri, 7 Aug 2009 20:51:07 +0100 Subject: [PATCH] Remove GetFullPath call from config includes, because it barfs in Windoze --- OpenSim/Framework/Util.cs | 3 --- OpenSim/Region/Application/ConfigurationLoader.cs | 3 +-- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs index 003c543c99..65d4f4d465 100644 --- a/OpenSim/Framework/Util.cs +++ b/OpenSim/Framework/Util.cs @@ -1155,10 +1155,7 @@ namespace OpenSim.Framework string[] files = Directory.GetFiles(p, c); foreach (string f in files) - { - m_log.InfoFormat("Adding file {0} to include list", f); found.Add(f); - } } paths = addpaths; } diff --git a/OpenSim/Region/Application/ConfigurationLoader.cs b/OpenSim/Region/Application/ConfigurationLoader.cs index 137879ac3b..7a9d7a8417 100644 --- a/OpenSim/Region/Application/ConfigurationLoader.cs +++ b/OpenSim/Region/Application/ConfigurationLoader.cs @@ -187,8 +187,7 @@ namespace OpenSim else { m_log.InfoFormat("Adding {0} to configuration", Path.Combine(Util.configDir(), file)); - string path = Path.GetFullPath( - Path.Combine(Util.configDir(), file)); + string path = Path.Combine(Util.configDir(), file); string[] paths = Util.Glob(path); foreach (string p in paths) {