aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorDavid Walter Seikel2016-11-05 18:24:40 +1000
committerDavid Walter Seikel2016-11-05 18:24:40 +1000
commit09531a03055f0f053bf55d860137c54c7f3a09b3 (patch)
tree7a5dcbe370de811692f19f26990711281f1d8715 /OpenSim/Region
parentFix up maptiles location. (diff)
downloadopensim-SC_OLD-09531a03055f0f053bf55d860137c54c7f3a09b3.zip
opensim-SC_OLD-09531a03055f0f053bf55d860137c54c7f3a09b3.tar.gz
opensim-SC_OLD-09531a03055f0f053bf55d860137c54c7f3a09b3.tar.bz2
opensim-SC_OLD-09531a03055f0f053bf55d860137c54c7f3a09b3.tar.xz
More config path fixes.
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Application/ConfigurationLoader.cs5
1 files changed, 2 insertions, 3 deletions
diff --git a/OpenSim/Region/Application/ConfigurationLoader.cs b/OpenSim/Region/Application/ConfigurationLoader.cs
index b19e549..cf7db97 100644
--- a/OpenSim/Region/Application/ConfigurationLoader.cs
+++ b/OpenSim/Region/Application/ConfigurationLoader.cs
@@ -154,15 +154,14 @@ namespace OpenSim
154 } 154 }
155 155
156 // Override distro settings with contents of inidirectory 156 // Override distro settings with contents of inidirectory
157 string iniDirName = startupConfig.GetString("inidirectory", "config"); 157 string iniDirPath = Path.GetFullPath(Path.Combine(Util.configDir(), startupConfig.GetString("inidirectory", "config")));
158 string iniDirPath = Path.Combine(Util.configDir(), iniDirName);
159 158
160 if (Directory.Exists(iniDirPath)) 159 if (Directory.Exists(iniDirPath))
161 { 160 {
162 m_log.InfoFormat("[CONFIG]: Searching folder {0} for config ini files", iniDirPath); 161 m_log.InfoFormat("[CONFIG]: Searching folder {0} for config ini files", iniDirPath);
163 List<string> overrideSources = new List<string>(); 162 List<string> overrideSources = new List<string>();
164 163
165 string[] fileEntries = Directory.GetFiles(iniDirName); 164 string[] fileEntries = Directory.GetFiles(iniDirPath);
166 foreach (string filePath in fileEntries) 165 foreach (string filePath in fileEntries)
167 { 166 {
168 if (Path.GetExtension(filePath).ToLower() == ".ini") 167 if (Path.GetExtension(filePath).ToLower() == ".ini")