diff options
author | onefang | 2020-09-08 21:17:45 +1000 |
---|---|---|
committer | onefang | 2020-09-08 21:17:45 +1000 |
commit | dcfd54b7608093d509cd045a152a4cde7317f66f (patch) | |
tree | 593eb822c05a6d209707593732e7e0fac4984663 /OpenSim/Region/Application | |
parent | Various database fixups. (diff) | |
download | opensim-SC-dcfd54b7608093d509cd045a152a4cde7317f66f.zip opensim-SC-dcfd54b7608093d509cd045a152a4cde7317f66f.tar.gz opensim-SC-dcfd54b7608093d509cd045a152a4cde7317f66f.tar.bz2 opensim-SC-dcfd54b7608093d509cd045a152a4cde7317f66f.tar.xz |
Move various paths out of the bin directory.
Diffstat (limited to 'OpenSim/Region/Application')
-rw-r--r-- | OpenSim/Region/Application/ConfigurationLoader.cs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/OpenSim/Region/Application/ConfigurationLoader.cs b/OpenSim/Region/Application/ConfigurationLoader.cs index 66e46cb..02a9941 100644 --- a/OpenSim/Region/Application/ConfigurationLoader.cs +++ b/OpenSim/Region/Application/ConfigurationLoader.cs | |||
@@ -153,15 +153,14 @@ namespace OpenSim | |||
153 | } | 153 | } |
154 | 154 | ||
155 | // Override distro settings with contents of inidirectory | 155 | // Override distro settings with contents of inidirectory |
156 | string iniDirName = startupConfig.GetString("inidirectory", "config"); | 156 | string iniDirPath = startupConfig.GetString("inidirectory", Util.configDir()); |
157 | string iniDirPath = Path.Combine(Util.configDir(), iniDirName); | ||
158 | 157 | ||
159 | if (Directory.Exists(iniDirPath)) | 158 | if (Directory.Exists(iniDirPath)) |
160 | { | 159 | { |
161 | m_log.InfoFormat("[CONFIG]: Searching folder {0} for config ini files", iniDirPath); | 160 | m_log.InfoFormat("[CONFIG]: Searching folder {0} for config ini files", iniDirPath); |
162 | List<string> overrideSources = new List<string>(); | 161 | List<string> overrideSources = new List<string>(); |
163 | 162 | ||
164 | string[] fileEntries = Directory.GetFiles(iniDirName); | 163 | string[] fileEntries = Directory.GetFiles(iniDirPath); |
165 | foreach (string filePath in fileEntries) | 164 | foreach (string filePath in fileEntries) |
166 | { | 165 | { |
167 | if (Path.GetExtension(filePath).ToLower() == ".ini") | 166 | if (Path.GetExtension(filePath).ToLower() == ".ini") |