diff options
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).
Diffstat (limited to '')
-rw-r--r-- | ThirdParty/3Di/LoadBalancer/LoadBalancerPlugin.cs | 6 |
1 files changed, 3 insertions, 3 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 | |||
79 | { | 79 | { |
80 | m_log.Info("[BALANCER] " + "Entering Initialize()"); | 80 | m_log.Info("[BALANCER] " + "Entering Initialize()"); |
81 | 81 | ||
82 | proxyURL = openSim.ConfigSource.Configs["Network"].GetString("proxy_url", ""); | 82 | proxyURL = openSim.ConfigSource.ConfigSource.Configs["Network"].GetString("proxy_url", ""); |
83 | if (proxyURL.Length == 0) return; | 83 | if (proxyURL.Length == 0) return; |
84 | 84 | ||
85 | StartTcpServer(); | 85 | StartTcpServer(); |
@@ -93,8 +93,8 @@ namespace OpenSim.ApplicationPlugins.LoadBalancer | |||
93 | simMain = openSim; | 93 | simMain = openSim; |
94 | commandServer = openSim.HttpServer; | 94 | commandServer = openSim.HttpServer; |
95 | 95 | ||
96 | proxyOffset = Int32.Parse(openSim.ConfigSource.Configs["Network"].GetString("proxy_offset", "0")); | 96 | proxyOffset = Int32.Parse(openSim.ConfigSource.ConfigSource.Configs["Network"].GetString("proxy_offset", "0")); |
97 | serializeDir = openSim.ConfigSource.Configs["Network"].GetString("serialize_dir", "/tmp/"); | 97 | serializeDir = openSim.ConfigSource.ConfigSource.Configs["Network"].GetString("serialize_dir", "/tmp/"); |
98 | 98 | ||
99 | commandServer.AddXmlRPCHandler("SerializeRegion", SerializeRegion); | 99 | commandServer.AddXmlRPCHandler("SerializeRegion", SerializeRegion); |
100 | commandServer.AddXmlRPCHandler("DeserializeRegion_Move", DeserializeRegion_Move); | 100 | commandServer.AddXmlRPCHandler("DeserializeRegion_Move", DeserializeRegion_Move); |