diff options
author | Jeff Ames | 2008-03-04 10:12:39 +0000 |
---|---|---|
committer | Jeff Ames | 2008-03-04 10:12:39 +0000 |
commit | d2806090aef48cff16d1ba2ae88ab0775f6a0489 (patch) | |
tree | 6e3115f4896a9edc4b7c68e18ebf15e44a527aba | |
parent | Fixed a region split synchronization bug (diff) | |
download | opensim-SC_OLD-d2806090aef48cff16d1ba2ae88ab0775f6a0489.zip opensim-SC_OLD-d2806090aef48cff16d1ba2ae88ab0775f6a0489.tar.gz opensim-SC_OLD-d2806090aef48cff16d1ba2ae88ab0775f6a0489.tar.bz2 opensim-SC_OLD-d2806090aef48cff16d1ba2ae88ab0775f6a0489.tar.xz |
Cleaned up a couple compiler warnings.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/ClientManager.cs | 1 | ||||
-rw-r--r-- | OpenSim/Grid/GridServer/GridManager.cs | 5 | ||||
-rw-r--r-- | ThirdParty/3Di/LoadBalancer/LoadBalancerPlugin.cs | 16 | ||||
-rw-r--r-- | ThirdParty/3Di/LoadBalancer/TcpServer.cs | 2 |
4 files changed, 12 insertions, 12 deletions
diff --git a/OpenSim/Framework/ClientManager.cs b/OpenSim/Framework/ClientManager.cs index a55e27c..9c6ac54 100644 --- a/OpenSim/Framework/ClientManager.cs +++ b/OpenSim/Framework/ClientManager.cs | |||
@@ -193,7 +193,6 @@ namespace OpenSim.Framework | |||
193 | packet.Header.Reliable = false; | 193 | packet.Header.Reliable = false; |
194 | LocalClients[i].OutPacket(packet, ThrottleOutPacketType.Task); | 194 | LocalClients[i].OutPacket(packet, ThrottleOutPacketType.Task); |
195 | } | 195 | } |
196 | |||
197 | } | 196 | } |
198 | } | 197 | } |
199 | 198 | ||
diff --git a/OpenSim/Grid/GridServer/GridManager.cs b/OpenSim/Grid/GridServer/GridManager.cs index 2e6a892..568f3f2 100644 --- a/OpenSim/Grid/GridServer/GridManager.cs +++ b/OpenSim/Grid/GridServer/GridManager.cs | |||
@@ -522,7 +522,7 @@ namespace OpenSim.Grid.GridServer | |||
522 | //RegionProfileData TheSim = null; | 522 | //RegionProfileData TheSim = null; |
523 | string uuid = String.Empty;; | 523 | string uuid = String.Empty;; |
524 | Hashtable requestData = (Hashtable) request.Params[0]; | 524 | Hashtable requestData = (Hashtable) request.Params[0]; |
525 | string myword; | 525 | |
526 | if (requestData.ContainsKey("UUID")) { | 526 | if (requestData.ContainsKey("UUID")) { |
527 | //TheSim = getRegion(new LLUUID((string) requestData["UUID"])); | 527 | //TheSim = getRegion(new LLUUID((string) requestData["UUID"])); |
528 | uuid = requestData["UUID"].ToString(); | 528 | uuid = requestData["UUID"].ToString(); |
@@ -559,7 +559,8 @@ namespace OpenSim.Grid.GridServer | |||
559 | break; | 559 | break; |
560 | } | 560 | } |
561 | } | 561 | } |
562 | catch (Exception e) { | 562 | catch (Exception) |
563 | { | ||
563 | m_log.Error("storage Unable to delete region " + uuid + " via MySQL"); | 564 | m_log.Error("storage Unable to delete region " + uuid + " via MySQL"); |
564 | //MainLog.Instance.Warn("storage", e.ToString()); | 565 | //MainLog.Instance.Warn("storage", e.ToString()); |
565 | } | 566 | } |
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); |