From dcfd54b7608093d509cd045a152a4cde7317f66f Mon Sep 17 00:00:00 2001
From: onefang
Date: Tue, 8 Sep 2020 21:17:45 +1000
Subject: Move various paths out of the bin directory.

---
 OpenSim/Region/Application/ConfigurationLoader.cs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'OpenSim/Region/Application')

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
             }
 
             // 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")
-- 
cgit v1.1