diff options
| author | Sean Dague | 2009-08-06 14:03:16 -0400 |
|---|---|---|
| committer | Sean Dague | 2009-08-06 14:03:16 -0400 |
| commit | 4078a331e2e851c051293472776ebebcc5dbaecc (patch) | |
| tree | c172fb9173821f9a30d37ee336f6592ccaf4510f /OpenSim/Region/Application | |
| parent | skip sqlite tests on z linux, as sqlite doesn't work right on the platform (diff) | |
| parent | Add the config-include statement to OpenSim.ini.example. (diff) | |
| download | opensim-SC_OLD-4078a331e2e851c051293472776ebebcc5dbaecc.zip opensim-SC_OLD-4078a331e2e851c051293472776ebebcc5dbaecc.tar.gz opensim-SC_OLD-4078a331e2e851c051293472776ebebcc5dbaecc.tar.bz2 opensim-SC_OLD-4078a331e2e851c051293472776ebebcc5dbaecc.tar.xz | |
Merge branch 'master' of git://opensimulator.org/git/opensim
Diffstat (limited to 'OpenSim/Region/Application')
| -rw-r--r-- | OpenSim/Region/Application/ConfigurationLoader.cs | 7 |
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 | } |