aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMelanie2009-08-07 20:51:07 +0100
committerMelanie2009-08-07 20:51:07 +0100
commitd10f1571831895fbdd0a818bf34590087078643a (patch)
treebda39ebb28ce36464e6823152ecb06ea23dd42a7 /OpenSim
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 '')
-rw-r--r--OpenSim/Framework/Util.cs3
-rw-r--r--OpenSim/Region/Application/ConfigurationLoader.cs3
2 files changed, 1 insertions, 5 deletions
diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs
index 003c543..65d4f4d 100644
--- a/OpenSim/Framework/Util.cs
+++ b/OpenSim/Framework/Util.cs
@@ -1155,10 +1155,7 @@ namespace OpenSim.Framework
1155 1155
1156 string[] files = Directory.GetFiles(p, c); 1156 string[] files = Directory.GetFiles(p, c);
1157 foreach (string f in files) 1157 foreach (string f in files)
1158 {
1159 m_log.InfoFormat("Adding file {0} to include list", f);
1160 found.Add(f); 1158 found.Add(f);
1161 }
1162 } 1159 }
1163 paths = addpaths; 1160 paths = addpaths;
1164 } 1161 }
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 {