aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/ThirdParty
diff options
context:
space:
mode:
Diffstat (limited to 'ThirdParty')
-rw-r--r--ThirdParty/3Di/LoadBalancer/LoadBalancerPlugin.cs16
-rw-r--r--ThirdParty/3Di/LoadBalancer/TcpServer.cs2
2 files changed, 9 insertions, 9 deletions
diff --git a/ThirdParty/3Di/LoadBalancer/LoadBalancerPlugin.cs b/ThirdParty/3Di/LoadBalancer/LoadBalancerPlugin.cs
index 267fe3c..981d96a 100644
--- a/ThirdParty/3Di/LoadBalancer/LoadBalancerPlugin.cs
+++ b/ThirdParty/3Di/LoadBalancer/LoadBalancerPlugin.cs
@@ -738,11 +738,11 @@ namespace OpenSim.ApplicationPlugins.LoadBalancer
738 IClientAPI controller = null; 738 IClientAPI controller = null;
739 739
740 foreach (uint code in circuits) 740 foreach (uint code in circuits)
741 { 741 {
742 m_log.InfoFormat("[BALANCER] "+"circuit code : {0}", code); 742 m_log.InfoFormat("[BALANCER] "+"circuit code : {0}", code);
743 743
744 if (scene.ClientManager.TryGetClient(code, out controller)) 744 if (scene.ClientManager.TryGetClient(code, out controller))
745 { 745 {
746 // Divide the presences evenly over the set of subscenes 746 // Divide the presences evenly over the set of subscenes
747 ClientView client = (ClientView) controller; 747 ClientView client = (ClientView) controller;
748 client.PacketProcessingEnabled = (( (i + myID) % sceneURL.Length) == 0); 748 client.PacketProcessingEnabled = (( (i + myID) % sceneURL.Length) == 0);
@@ -750,15 +750,15 @@ namespace OpenSim.ApplicationPlugins.LoadBalancer
750 m_log.InfoFormat("[SPLITSCENE] === SplitRegion {0}: SP.PacketEnabled {1}", region.RegionID, client.PacketProcessingEnabled); 750 m_log.InfoFormat("[SPLITSCENE] === SplitRegion {0}: SP.PacketEnabled {1}", region.RegionID, client.PacketProcessingEnabled);
751 751
752 if (!client.PacketProcessingEnabled) 752 if (!client.PacketProcessingEnabled)
753 { 753 {
754 // stopping clientview thread 754 // stopping clientview thread
755 client.Stop(); 755 client.Stop();
756 } 756 }
757
758 ++i;
759 }
760 }
757 761
758 ++i;
759 }
760 }
761
762 scene.splitID = myID; 762 scene.splitID = myID;
763 scene.SynchronizeScene = new Scene.SynchronizeSceneHandler(SynchronizeScenes); 763 scene.SynchronizeScene = new Scene.SynchronizeSceneHandler(SynchronizeScenes);
764 isSplit = true; 764 isSplit = true;
diff --git a/ThirdParty/3Di/LoadBalancer/TcpServer.cs b/ThirdParty/3Di/LoadBalancer/TcpServer.cs
index 4e651b6..2d46294 100644
--- a/ThirdParty/3Di/LoadBalancer/TcpServer.cs
+++ b/ThirdParty/3Di/LoadBalancer/TcpServer.cs
@@ -175,7 +175,7 @@ namespace OpenSim.ApplicationPlugins.LoadBalancer {
175 } // while (true) 175 } // while (true)
176 176
177 } 177 }
178 catch (Exception e) 178 catch (Exception)
179 { 179 {
180 //MainLog.Instance.Verbose("TCPSERVER", e.ToString()); 180 //MainLog.Instance.Verbose("TCPSERVER", e.ToString());
181 //MainLog.Instance.Verbose("TCPSERVER", e.StackTrace); 181 //MainLog.Instance.Verbose("TCPSERVER", e.StackTrace);