diff options
| author | Melanie | 2010-08-18 00:59:20 +0100 |
|---|---|---|
| committer | Melanie | 2010-08-18 00:59:20 +0100 |
| commit | e74809ff4c7fd67ceb5336e5d8e7811591f6cce3 (patch) | |
| tree | 3e878fb80be75106631d76a12b8da9e65e98f7b9 /OpenSim/Tools | |
| parent | Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca... (diff) | |
| parent | * Changed a few OSD.FromBinary() calls to the more accurate OSD.FromULong() t... (diff) | |
| download | opensim-SC-e74809ff4c7fd67ceb5336e5d8e7811591f6cce3.zip opensim-SC-e74809ff4c7fd67ceb5336e5d8e7811591f6cce3.tar.gz opensim-SC-e74809ff4c7fd67ceb5336e5d8e7811591f6cce3.tar.bz2 opensim-SC-e74809ff4c7fd67ceb5336e5d8e7811591f6cce3.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Tools')
| -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 | { |