aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorMelanie2009-08-06 02:29:12 +0100
committerMelanie2009-08-06 02:29:12 +0100
commitefc57bc3d79e9c3c0971a2715a407ad08e030f02 (patch)
treece617eb668ecf495668c2ceac5a6bc30d93f7671 /OpenSim/Region
parentComplete the work on the Replaceable interface logic. From this commit onwards (diff)
downloadopensim-SC-efc57bc3d79e9c3c0971a2715a407ad08e030f02.zip
opensim-SC-efc57bc3d79e9c3c0971a2715a407ad08e030f02.tar.gz
opensim-SC-efc57bc3d79e9c3c0971a2715a407ad08e030f02.tar.bz2
opensim-SC-efc57bc3d79e9c3c0971a2715a407ad08e030f02.tar.xz
Allow arbitrary wildcards in config includes. Things like
Include-Modules = "addin-modules/*/config/*.ini" will now work. Adds Util.Glob, which will resolve a globbed path into a string list.
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Application/ConfigurationLoader.cs7
1 files changed, 4 insertions, 3 deletions
diff --git a/OpenSim/Region/Application/ConfigurationLoader.cs b/OpenSim/Region/Application/ConfigurationLoader.cs
index 1be36ca..7bb8864 100644
--- a/OpenSim/Region/Application/ConfigurationLoader.cs
+++ b/OpenSim/Region/Application/ConfigurationLoader.cs
@@ -188,10 +188,11 @@ namespace OpenSim
188 { 188 {
189 string path = Path.GetFullPath( 189 string path = Path.GetFullPath(
190 Path.Combine(Util.configDir(), file)); 190 Path.Combine(Util.configDir(), file));
191 if (File.Exists(path)) 191 string[] paths = Util.Glob(path);
192 foreach (string p in paths)
192 { 193 {
193 if (!sources.Contains(path)) 194 if (!sources.Contains(p))
194 sources.Add(path); 195 sources.Add(p);
195 } 196 }
196 } 197 }
197 } 198 }