From 682ec53420ffac9918febc12b7140363602812e5 Mon Sep 17 00:00:00 2001 From: MW Date: Thu, 26 Jun 2008 17:20:08 +0000 Subject: 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). --- ThirdParty/3Di/LoadBalancer/LoadBalancerPlugin.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'ThirdParty/3Di/LoadBalancer') 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); -- cgit v1.1