diff --git a/OpenSim/Framework/ClientManager.cs b/OpenSim/Framework/ClientManager.cs index a55e27c035..9c6ac54a43 100644 --- a/OpenSim/Framework/ClientManager.cs +++ b/OpenSim/Framework/ClientManager.cs @@ -193,7 +193,6 @@ namespace OpenSim.Framework packet.Header.Reliable = false; LocalClients[i].OutPacket(packet, ThrottleOutPacketType.Task); } - } } diff --git a/OpenSim/Grid/GridServer/GridManager.cs b/OpenSim/Grid/GridServer/GridManager.cs index 2e6a892858..568f3f2f55 100644 --- a/OpenSim/Grid/GridServer/GridManager.cs +++ b/OpenSim/Grid/GridServer/GridManager.cs @@ -522,7 +522,7 @@ namespace OpenSim.Grid.GridServer //RegionProfileData TheSim = null; string uuid = String.Empty;; Hashtable requestData = (Hashtable) request.Params[0]; - string myword; + if (requestData.ContainsKey("UUID")) { //TheSim = getRegion(new LLUUID((string) requestData["UUID"])); uuid = requestData["UUID"].ToString(); @@ -559,7 +559,8 @@ namespace OpenSim.Grid.GridServer break; } } - catch (Exception e) { + catch (Exception) + { m_log.Error("storage Unable to delete region " + uuid + " via MySQL"); //MainLog.Instance.Warn("storage", e.ToString()); } diff --git a/ThirdParty/3Di/LoadBalancer/LoadBalancerPlugin.cs b/ThirdParty/3Di/LoadBalancer/LoadBalancerPlugin.cs index 267fe3c2da..981d96a726 100644 --- a/ThirdParty/3Di/LoadBalancer/LoadBalancerPlugin.cs +++ b/ThirdParty/3Di/LoadBalancer/LoadBalancerPlugin.cs @@ -738,11 +738,11 @@ namespace OpenSim.ApplicationPlugins.LoadBalancer IClientAPI controller = null; foreach (uint code in circuits) - { + { m_log.InfoFormat("[BALANCER] "+"circuit code : {0}", code); if (scene.ClientManager.TryGetClient(code, out controller)) - { + { // Divide the presences evenly over the set of subscenes ClientView client = (ClientView) controller; client.PacketProcessingEnabled = (( (i + myID) % sceneURL.Length) == 0); @@ -750,15 +750,15 @@ namespace OpenSim.ApplicationPlugins.LoadBalancer m_log.InfoFormat("[SPLITSCENE] === SplitRegion {0}: SP.PacketEnabled {1}", region.RegionID, client.PacketProcessingEnabled); if (!client.PacketProcessingEnabled) - { + { // stopping clientview thread client.Stop(); - } + } + + ++i; + } + } - ++i; - } - } - scene.splitID = myID; scene.SynchronizeScene = new Scene.SynchronizeSceneHandler(SynchronizeScenes); isSplit = true; diff --git a/ThirdParty/3Di/LoadBalancer/TcpServer.cs b/ThirdParty/3Di/LoadBalancer/TcpServer.cs index 4e651b684e..2d4629418a 100644 --- a/ThirdParty/3Di/LoadBalancer/TcpServer.cs +++ b/ThirdParty/3Di/LoadBalancer/TcpServer.cs @@ -175,7 +175,7 @@ namespace OpenSim.ApplicationPlugins.LoadBalancer { } // while (true) } - catch (Exception e) + catch (Exception) { //MainLog.Instance.Verbose("TCPSERVER", e.ToString()); //MainLog.Instance.Verbose("TCPSERVER", e.StackTrace);