Move cache, config, logs out of tree, and various related clean ups.

1 files changed, 2 insertions, 3 deletions

diff --git a/OpenSim/Region/Application/ConfigurationLoader.cs b/OpenSim/Region/Application/ConfigurationLoader.cs
index 62bd4f4..19db7a9 100644
--- a/OpenSim/Region/Application/ConfigurationLoader.cs
+++ b/OpenSim/Region/Application/ConfigurationLoader.cs
@@ -154,15 +154,14 @@ namespace OpenSim
             }
 
             // Override distro settings with contents of inidirectory
-            string iniDirName = startupConfig.GetString("inidirectory", "config");
-            string iniDirPath = Path.Combine(Util.configDir(), iniDirName);
+            string iniDirPath = startupConfig.GetString("inidirectory", Util.configDir());
 
             if (Directory.Exists(iniDirPath))
             {
                 m_log.InfoFormat("[CONFIG]: Searching folder {0} for config ini files", iniDirPath);
                 List<string> overrideSources = new List<string>();
 
-                string[] fileEntries = Directory.GetFiles(iniDirName);
+                string[] fileEntries = Directory.GetFiles(iniDirPath);
                 foreach (string filePath in fileEntries)
                 {
                     if (Path.GetExtension(filePath).ToLower() == ".ini")