diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Tools/Configger/ConfigurationLoader.cs | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/OpenSim/Tools/Configger/ConfigurationLoader.cs b/OpenSim/Tools/Configger/ConfigurationLoader.cs index e74debb..8e71b42 100644 --- a/OpenSim/Tools/Configger/ConfigurationLoader.cs +++ b/OpenSim/Tools/Configger/ConfigurationLoader.cs | |||
@@ -141,7 +141,17 @@ namespace OpenSim.Tools.Configger | |||
141 | else | 141 | else |
142 | { | 142 | { |
143 | string basepath = Path.GetFullPath("."); | 143 | string basepath = Path.GetFullPath("."); |
144 | string path = Path.Combine(basepath, file); | 144 | // Resolve relative paths with wildcards |
145 | string chunkWithoutWildcards = file; | ||
146 | string chunkWithWildcards = string.Empty; | ||
147 | int wildcardIndex = file.IndexOfAny(new char[] { '*', '?' }); | ||
148 | if (wildcardIndex != -1) | ||
149 | { | ||
150 | chunkWithoutWildcards = file.Substring(0, wildcardIndex); | ||
151 | chunkWithWildcards = file.Substring(wildcardIndex); | ||
152 | } | ||
153 | string path = Path.Combine(basepath, chunkWithoutWildcards); | ||
154 | path = Path.GetFullPath(path) + chunkWithWildcards; | ||
145 | string[] paths = Util.Glob(path); | 155 | string[] paths = Util.Glob(path); |
146 | foreach (string p in paths) | 156 | foreach (string p in paths) |
147 | { | 157 | { |