diff options
| author | Melanie | 2009-08-07 22:40:58 +0100 |
|---|---|---|
| committer | Melanie | 2009-08-07 22:40:58 +0100 |
| commit | a1a09297bc291f402ed07b40da66c8da3e35d27b (patch) | |
| tree | b44b79ff7aa81970e76f88a3314bc9e2b89bf3dd | |
| parent | Try another way to canonicalize the path that may work in Windoze (diff) | |
| download | opensim-SC-a1a09297bc291f402ed07b40da66c8da3e35d27b.zip opensim-SC-a1a09297bc291f402ed07b40da66c8da3e35d27b.tar.gz opensim-SC-a1a09297bc291f402ed07b40da66c8da3e35d27b.tar.bz2 opensim-SC-a1a09297bc291f402ed07b40da66c8da3e35d27b.tar.xz | |
Silly error, simple fix
| -rw-r--r-- | OpenSim/Region/Application/ConfigurationLoader.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Application/ConfigurationLoader.cs b/OpenSim/Region/Application/ConfigurationLoader.cs index fa4ff48..3bdbc7d 100644 --- a/OpenSim/Region/Application/ConfigurationLoader.cs +++ b/OpenSim/Region/Application/ConfigurationLoader.cs | |||
| @@ -187,8 +187,8 @@ 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 base = Path.GetFullPath(Util.configDir()); | 190 | string basepath = Path.GetFullPath(Util.configDir()); |
| 191 | string path = Path.Combine(base, file); | 191 | string path = Path.Combine(basepath, file); |
| 192 | string[] paths = Util.Glob(path); | 192 | string[] paths = Util.Glob(path); |
| 193 | foreach (string p in paths) | 193 | foreach (string p in paths) |
| 194 | { | 194 | { |