From 8c55f3eaa671f22012a567138b6ee55b4c3e4941 Mon Sep 17 00:00:00 2001 From: Justin Clarke Casey Date: Fri, 3 Oct 2008 14:18:17 +0000 Subject: * minor: remove warnings (the code cleaners strike again) --- OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 6 +++--- OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs | 1 - OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs | 3 +-- 3 files changed, 4 insertions(+), 6 deletions(-) (limited to 'OpenSim/Region/ClientStack/LindenUDP') diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index 1c7bbec..af760ae 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs @@ -783,8 +783,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP ClientLoop(); } - } - //Todo set as Generic Exception again. + } catch (System.Exception e) { if (e is ThreadAbortException) @@ -794,7 +793,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP StatsManager.SimExtraStats.AddAbnormalClientThreadTermination(); // Don't let a failure in an individual client thread crash the whole sim. - m_log.ErrorFormat("[CLIENT]: Client thread for {0} {1} crashed. Logging them out. Exception {2}", Name, AgentId, e); + m_log.ErrorFormat( + "[CLIENT]: Client thread for {0} {1} crashed. Logging them out. Exception {2}", Name, AgentId, e); try { diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs b/OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs index a1118cb..78a916d 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs @@ -762,7 +762,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP { Packet packet = item.Packet; - // Assign sequence number here to prevent out of order packets if (packet.Header.Sequence == 0) { diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs b/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs index 81c789a..39ade56 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs @@ -413,10 +413,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP } } - private static int ScaleThrottle(int value, int curmax, int newmax) { - return (value / curmax) * newmax; + return (int)((value / (float)curmax) * newmax); } public byte[] GetThrottlesPacked(float multiplier) -- cgit v1.1