aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/ThirdParty/3Di
diff options
context:
space:
mode:
authorJohan Berntsson2008-03-11 02:49:44 +0000
committerJohan Berntsson2008-03-11 02:49:44 +0000
commit9ef044727eb0556021c32844887b6f93b993cc6f (patch)
treedb427fc8a773ea23413c7e092002e82bfc995480 /ThirdParty/3Di
parentthis fixes up the exponentially growing startup times caused (diff)
downloadopensim-SC_OLD-9ef044727eb0556021c32844887b6f93b993cc6f.zip
opensim-SC_OLD-9ef044727eb0556021c32844887b6f93b993cc6f.tar.gz
opensim-SC_OLD-9ef044727eb0556021c32844887b6f93b993cc6f.tar.bz2
opensim-SC_OLD-9ef044727eb0556021c32844887b6f93b993cc6f.tar.xz
this fixes a port initialization problem in the LoadBalancer plugin
Diffstat (limited to 'ThirdParty/3Di')
-rw-r--r--ThirdParty/3Di/LoadBalancer/LoadBalancerPlugin.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/ThirdParty/3Di/LoadBalancer/LoadBalancerPlugin.cs b/ThirdParty/3Di/LoadBalancer/LoadBalancerPlugin.cs
index fa54035..f8cac5b 100644
--- a/ThirdParty/3Di/LoadBalancer/LoadBalancerPlugin.cs
+++ b/ThirdParty/3Di/LoadBalancer/LoadBalancerPlugin.cs
@@ -79,6 +79,9 @@ 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", "");
83 if(proxyURL.Length==0) return;
84
82 StartTcpServer(); 85 StartTcpServer();
83 ClientView.SynchronizeClient = new ClientView.SynchronizeClientHandler(SynchronizePackets); 86 ClientView.SynchronizeClient = new ClientView.SynchronizeClientHandler(SynchronizePackets);
84 AsynchronousSocketListener.PacketHandler = new AsynchronousSocketListener.PacketRecieveHandler(SynchronizePacketRecieve); 87 AsynchronousSocketListener.PacketHandler = new AsynchronousSocketListener.PacketRecieveHandler(SynchronizePacketRecieve);
@@ -90,9 +93,6 @@ namespace OpenSim.ApplicationPlugins.LoadBalancer
90 this.commandServer = openSim.HttpServer; 93 this.commandServer = openSim.HttpServer;
91 94
92 proxyOffset = Int32.Parse(openSim.ConfigSource.Configs["Network"].GetString("proxy_offset", "0")); 95 proxyOffset = Int32.Parse(openSim.ConfigSource.Configs["Network"].GetString("proxy_offset", "0"));
93 proxyURL = openSim.ConfigSource.Configs["Network"].GetString("proxy_url", "");
94 if(proxyURL.Length==0) return;
95
96 serializeDir = openSim.ConfigSource.Configs["Network"].GetString("serialize_dir", "/tmp/"); 96 serializeDir = openSim.ConfigSource.Configs["Network"].GetString("serialize_dir", "/tmp/");
97 97
98 commandServer.AddXmlRPCHandler("SerializeRegion", SerializeRegion); 98 commandServer.AddXmlRPCHandler("SerializeRegion", SerializeRegion);