OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* Made 3Di LoadBalancerPlugin compatible with recent IClientNetworkServer changes. 

* It's slightly hackish in that it will not work with another client type, but LoadBalancerPlugin is very dependent on the LL Architecture and is unlikely to be useful with a different protocol anyway.
0.6.0-stable
Adam Frisby 2008-05-03 19:38:03 +00:00
parent dcf004aa0d
commit 9485b52f97
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ThirdParty/3Di/LoadBalancer/LoadBalancerPlugin.cs vendored
View File

@ -81,10 +81,9 @@ namespace OpenSim.ApplicationPlugins.LoadBalancer
if (proxyURL.Length == 0) return; if (proxyURL.Length == 0) return;
StartTcpServer(); StartTcpServer();
// BUG: This needs to be fixed
// TODO: YARLY. LLClientView.SynchronizeClient = SynchronizePackets;
// LLClientView.SynchronizeClient = new LLClientView.SynchronizeClientHandler(SynchronizePackets); AsynchronousSocketListener.PacketHandler = SynchronizePacketRecieve;
AsynchronousSocketListener.PacketHandler = new AsynchronousSocketListener.PacketRecieveHandler(SynchronizePacketRecieve);
sceneManager = openSim.SceneManager; sceneManager = openSim.SceneManager;
m_clientServers = openSim.ClientServers; m_clientServers = openSim.ClientServers;
@ -495,8 +494,6 @@ namespace OpenSim.ApplicationPlugins.LoadBalancer
m_log.InfoFormat("[BALANCER] " + "region deserialized [{0}]", dst_region.RegionID); m_log.InfoFormat("[BALANCER] " + "region deserialized [{0}]", dst_region.RegionID);
} }
// BUG: This looks dodgy. Johan please look at this.
// Prevent nullreference on zero entry
if (dst_region != null) if (dst_region != null)
{ {
// deserialization of client data // deserialization of client data
@ -561,7 +558,6 @@ namespace OpenSim.ApplicationPlugins.LoadBalancer
AgentCircuitData agentdata = new AgentCircuitData(data.agentcircuit); AgentCircuitData agentdata = new AgentCircuitData(data.agentcircuit);
scene.AuthenticateHandler.AddNewCircuit(circuit_code, agentdata); scene.AuthenticateHandler.AddNewCircuit(circuit_code, agentdata);
// BUG: Will only work with LLUDPServer.
// TODO: This needs to be abstracted and converted into IClientNetworkServer // TODO: This needs to be abstracted and converted into IClientNetworkServer
if (clientserv is LLUDPServer) if (clientserv is LLUDPServer)
{ {