As per the suggestion on the mailing list, added support for a OpenSim.xml config file, instead of a ini file. INI files still work the same as they did before, just now if a ini file isn't found, it looks for a OpenSim.xml file (of course in xml format) and if found uses that.

Includes a OpenSim.Example.xml for reference (the default settings saved as a xml file).

2 files changed, 6 insertions, 6 deletions

diff --git a/OpenSim/Framework/RegionLoader/Filesystem/RegionLoaderFileSystem.cs b/OpenSim/Framework/RegionLoader/Filesystem/RegionLoaderFileSystem.cs
index 0c01c5a..c345fce 100644
--- a/OpenSim/Framework/RegionLoader/Filesystem/RegionLoaderFileSystem.cs
+++ b/OpenSim/Framework/RegionLoader/Filesystem/RegionLoaderFileSystem.cs
@@ -33,9 +33,9 @@ namespace OpenSim.Framework.RegionLoader.Filesystem
 {
     public class RegionLoaderFileSystem : IRegionLoader
     {
-        private IniConfigSource m_configSouce;
+        private IConfigSource m_configSouce;
 
-        public void SetIniConfigSource(IniConfigSource configSource)
+        public void SetIniConfigSource(IConfigSource configSource)
         {
             m_configSouce = configSource;
         }
@@ -46,7 +46,7 @@ namespace OpenSim.Framework.RegionLoader.Filesystem
 
             try
             {
-                IniConfig startupConfig = (IniConfig)m_configSouce.Configs["Startup"];
+                IConfig startupConfig = (IConfig)m_configSouce.Configs["Startup"];
                 regionConfigPath = startupConfig.GetString("regionload_regionsdir", regionConfigPath).Trim();
             }
             catch (Exception)
diff --git a/OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs b/OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs
index 17077e7..029d396 100644
--- a/OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs
+++ b/OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs
@@ -39,9 +39,9 @@ namespace OpenSim.Framework.RegionLoader.Web
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
-        private IniConfigSource m_configSouce;
+        private IConfigSource m_configSouce;
 
-        public void SetIniConfigSource(IniConfigSource configSource)
+        public void SetIniConfigSource(IConfigSource configSource)
         {
             m_configSouce = configSource;
         }
@@ -55,7 +55,7 @@ namespace OpenSim.Framework.RegionLoader.Web
             }
             else
             {
-                IniConfig startupConfig = (IniConfig) m_configSouce.Configs["Startup"];
+                IConfig startupConfig = (IConfig) m_configSouce.Configs["Startup"];
                 string url = startupConfig.GetString("regionload_webserver_url", String.Empty).Trim();
                 if (url == String.Empty)
                 {