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).

1 files changed, 2 insertions, 2 deletions

diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index 6f1a3cb..4738dfc 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -69,7 +69,7 @@ namespace OpenSim
 
         protected override void ReadConfigSettings()
         {
-            IConfig startupConfig = m_config.Configs["Startup"];
+            IConfig startupConfig = m_config.ConfigSource.Configs["Startup"];
 
             if (startupConfig != null)
             {
@@ -528,7 +528,7 @@ namespace OpenSim
                                         c = DefaultConfig().AddConfig(cmdparams[1]);
                                     string _value = String.Join(" ", cmdparams, 3, cmdparams.Length - 3);
                                     c.Set(cmdparams[2], _value);
-                                    m_config.Merge(c.ConfigSource);
+                                    m_config.ConfigSource.Merge(c.ConfigSource);
 
                                     m_console.Error(n, n + " " + n + " " + cmdparams[1] + " " + cmdparams[2] + " " +
                                                     _value);