aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorAdam Frisby2008-05-03 19:38:03 +0000
committerAdam Frisby2008-05-03 19:38:03 +0000
commit9485b52f97b10fa401891cc925ca732a7240214b (patch)
treecf2c350c84365ee7604527ebf31acc6e4d678e32
parent* Refactoring and major cleaning work done on 3Di's LoadBalancerPlugin - Joha... (diff)
downloadopensim-SC_OLD-9485b52f97b10fa401891cc925ca732a7240214b.zip
opensim-SC_OLD-9485b52f97b10fa401891cc925ca732a7240214b.tar.gz
opensim-SC_OLD-9485b52f97b10fa401891cc925ca732a7240214b.tar.bz2
opensim-SC_OLD-9485b52f97b10fa401891cc925ca732a7240214b.tar.xz
* 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.
-rw-r--r--ThirdParty/3Di/LoadBalancer/LoadBalancerPlugin.cs10
1 files changed, 3 insertions, 7 deletions
diff --git a/ThirdParty/3Di/LoadBalancer/LoadBalancerPlugin.cs b/ThirdParty/3Di/LoadBalancer/LoadBalancerPlugin.cs
index 7025877..4440db1 100644
--- a/ThirdParty/3Di/LoadBalancer/LoadBalancerPlugin.cs
+++ b/ThirdParty/3Di/LoadBalancer/LoadBalancerPlugin.cs
@@ -81,10 +81,9 @@ namespace OpenSim.ApplicationPlugins.LoadBalancer
81 if (proxyURL.Length == 0) return; 81 if (proxyURL.Length == 0) return;
82 82
83 StartTcpServer(); 83 StartTcpServer();
84 // BUG: This needs to be fixed 84
85 // TODO: YARLY. 85 LLClientView.SynchronizeClient = SynchronizePackets;
86 // LLClientView.SynchronizeClient = new LLClientView.SynchronizeClientHandler(SynchronizePackets); 86 AsynchronousSocketListener.PacketHandler = SynchronizePacketRecieve;
87 AsynchronousSocketListener.PacketHandler = new AsynchronousSocketListener.PacketRecieveHandler(SynchronizePacketRecieve);
88 87
89 sceneManager = openSim.SceneManager; 88 sceneManager = openSim.SceneManager;
90 m_clientServers = openSim.ClientServers; 89 m_clientServers = openSim.ClientServers;
@@ -495,8 +494,6 @@ namespace OpenSim.ApplicationPlugins.LoadBalancer
495 m_log.InfoFormat("[BALANCER] " + "region deserialized [{0}]", dst_region.RegionID); 494 m_log.InfoFormat("[BALANCER] " + "region deserialized [{0}]", dst_region.RegionID);
496 } 495 }
497 496
498 // BUG: This looks dodgy. Johan please look at this.
499 // Prevent nullreference on zero entry
500 if (dst_region != null) 497 if (dst_region != null)
501 { 498 {
502 // deserialization of client data 499 // deserialization of client data
@@ -561,7 +558,6 @@ namespace OpenSim.ApplicationPlugins.LoadBalancer
561 AgentCircuitData agentdata = new AgentCircuitData(data.agentcircuit); 558 AgentCircuitData agentdata = new AgentCircuitData(data.agentcircuit);
562 scene.AuthenticateHandler.AddNewCircuit(circuit_code, agentdata); 559 scene.AuthenticateHandler.AddNewCircuit(circuit_code, agentdata);
563 560
564 // BUG: Will only work with LLUDPServer.
565 // TODO: This needs to be abstracted and converted into IClientNetworkServer 561 // TODO: This needs to be abstracted and converted into IClientNetworkServer
566 if (clientserv is LLUDPServer) 562 if (clientserv is LLUDPServer)
567 { 563 {