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, 4 insertions, 4 deletions

diff --git a/ThirdParty/3Di/LoadBalancer/LoadBalancerPlugin.cs b/ThirdParty/3Di/LoadBalancer/LoadBalancerPlugin.cs
index 69b8fea..e22231c 100644
--- a/ThirdParty/3Di/LoadBalancer/LoadBalancerPlugin.cs
+++ b/ThirdParty/3Di/LoadBalancer/LoadBalancerPlugin.cs
@@ -79,7 +79,7 @@ namespace OpenSim.ApplicationPlugins.LoadBalancer
         {
             m_log.Info("[BALANCER] " + "Entering Initialize()");
 
-            proxyURL = openSim.ConfigSource.Configs["Network"].GetString("proxy_url", "");
+            proxyURL = openSim.ConfigSource.ConfigSource.Configs["Network"].GetString("proxy_url", "");
             if (proxyURL.Length == 0) return;
 
             StartTcpServer();
@@ -93,8 +93,8 @@ namespace OpenSim.ApplicationPlugins.LoadBalancer
             simMain = openSim;
             commandServer = openSim.HttpServer;
 
-            proxyOffset = Int32.Parse(openSim.ConfigSource.Configs["Network"].GetString("proxy_offset", "0"));
-            serializeDir = openSim.ConfigSource.Configs["Network"].GetString("serialize_dir", "/tmp/");
+            proxyOffset = Int32.Parse(openSim.ConfigSource.ConfigSource.Configs["Network"].GetString("proxy_offset", "0"));
+            serializeDir = openSim.ConfigSource.ConfigSource.Configs["Network"].GetString("serialize_dir", "/tmp/");
 
             commandServer.AddXmlRPCHandler("SerializeRegion", SerializeRegion);
             commandServer.AddXmlRPCHandler("DeserializeRegion_Move", DeserializeRegion_Move);
diff --git a/ThirdParty/3Di/RegionProxy/RegionProxyPlugin.cs b/ThirdParty/3Di/RegionProxy/RegionProxyPlugin.cs
index c9711c3..d8376b4 100644
--- a/ThirdParty/3Di/RegionProxy/RegionProxyPlugin.cs
+++ b/ThirdParty/3Di/RegionProxy/RegionProxyPlugin.cs
@@ -72,7 +72,7 @@ namespace OpenSim.ApplicationPlugins.RegionProxy
         public void Initialise(OpenSimBase openSim)
         {
             m_log.Info("Starting proxy");
-            string proxyURL = openSim.ConfigSource.Configs["Network"].GetString("proxy_url", "");
+            string proxyURL = openSim.ConfigSource.ConfigSource.Configs["Network"].GetString("proxy_url", "");
             if (proxyURL.Length == 0) return;
 
             uint port = (uint) Int32.Parse(proxyURL.Split(new char[] {':'})[2]);