aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application
diff options
context:
space:
mode:
authorMelanie2009-08-07 20:51:07 +0100
committerMelanie2009-08-07 20:51:07 +0100
commitd10f1571831895fbdd0a818bf34590087078643a (patch)
treebda39ebb28ce36464e6823152ecb06ea23dd42a7 /OpenSim/Region/Application
parentAnother stab at cmickeyb's patch for script GC. (diff)
downloadopensim-SC_OLD-d10f1571831895fbdd0a818bf34590087078643a.zip
opensim-SC_OLD-d10f1571831895fbdd0a818bf34590087078643a.tar.gz
opensim-SC_OLD-d10f1571831895fbdd0a818bf34590087078643a.tar.bz2
opensim-SC_OLD-d10f1571831895fbdd0a818bf34590087078643a.tar.xz
Remove GetFullPath call from config includes, because it barfs in Windoze
Diffstat (limited to 'OpenSim/Region/Application')
-rw-r--r--OpenSim/Region/Application/ConfigurationLoader.cs3
1 files changed, 1 insertions, 2 deletions
diff --git a/OpenSim/Region/Application/ConfigurationLoader.cs b/OpenSim/Region/Application/ConfigurationLoader.cs
index 137879a..7a9d7a8 100644
--- a/OpenSim/Region/Application/ConfigurationLoader.cs
+++ b/OpenSim/Region/Application/ConfigurationLoader.cs
@@ -187,8 +187,7 @@ 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.GetFullPath( 190 string path = Path.Combine(Util.configDir(), file);
191 Path.Combine(Util.configDir(), file));
192 string[] paths = Util.Glob(path); 191 string[] paths = Util.Glob(path);
193 foreach (string p in paths) 192 foreach (string p in paths)
194 { 193 {