aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application/ConfigurationLoader.cs
diff options
context:
space:
mode:
authorMelanie2009-08-07 22:37:41 +0100
committerMelanie2009-08-07 22:37:41 +0100
commite1427b4c3f3326275ecbbf158495290ba6571a21 (patch)
treeb0078d53ac8c8e5efa768a2aee886e441bcdcc8f /OpenSim/Region/Application/ConfigurationLoader.cs
parentRemove the OpenSim.Services.exe project (diff)
downloadopensim-SC_OLD-e1427b4c3f3326275ecbbf158495290ba6571a21.zip
opensim-SC_OLD-e1427b4c3f3326275ecbbf158495290ba6571a21.tar.gz
opensim-SC_OLD-e1427b4c3f3326275ecbbf158495290ba6571a21.tar.bz2
opensim-SC_OLD-e1427b4c3f3326275ecbbf158495290ba6571a21.tar.xz
Try another way to canonicalize the path that may work in Windoze
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Application/ConfigurationLoader.cs3
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/Application/ConfigurationLoader.cs b/OpenSim/Region/Application/ConfigurationLoader.cs
index 7a9d7a8..fa4ff48 100644
--- a/OpenSim/Region/Application/ConfigurationLoader.cs
+++ b/OpenSim/Region/Application/ConfigurationLoader.cs
@@ -187,7 +187,8 @@ namespace OpenSim
187 else 187 else
188 { 188 {
189 m_log.InfoFormat("Adding {0} to configuration", Path.Combine(Util.configDir(), file)); 189 m_log.InfoFormat("Adding {0} to configuration", Path.Combine(Util.configDir(), file));
190 string path = Path.Combine(Util.configDir(), file); 190 string base = Path.GetFullPath(Util.configDir());
191 string path = Path.Combine(base, file);
191 string[] paths = Util.Glob(path); 192 string[] paths = Util.Glob(path);
192 foreach (string p in paths) 193 foreach (string p in paths)
193 { 194 {