diff options
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 6 | ||||
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs | 1 | ||||
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs | 3 |
3 files changed, 4 insertions, 6 deletions
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 | |||
783 | 783 | ||
784 | ClientLoop(); | 784 | ClientLoop(); |
785 | } | 785 | } |
786 | } | 786 | } |
787 | //Todo set as Generic Exception again. | ||
788 | catch (System.Exception e) | 787 | catch (System.Exception e) |
789 | { | 788 | { |
790 | if (e is ThreadAbortException) | 789 | if (e is ThreadAbortException) |
@@ -794,7 +793,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
794 | StatsManager.SimExtraStats.AddAbnormalClientThreadTermination(); | 793 | StatsManager.SimExtraStats.AddAbnormalClientThreadTermination(); |
795 | 794 | ||
796 | // Don't let a failure in an individual client thread crash the whole sim. | 795 | // Don't let a failure in an individual client thread crash the whole sim. |
797 | m_log.ErrorFormat("[CLIENT]: Client thread for {0} {1} crashed. Logging them out. Exception {2}", Name, AgentId, e); | 796 | m_log.ErrorFormat( |
797 | "[CLIENT]: Client thread for {0} {1} crashed. Logging them out. Exception {2}", Name, AgentId, e); | ||
798 | 798 | ||
799 | try | 799 | try |
800 | { | 800 | { |
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 | |||
762 | { | 762 | { |
763 | Packet packet = item.Packet; | 763 | Packet packet = item.Packet; |
764 | 764 | ||
765 | |||
766 | // Assign sequence number here to prevent out of order packets | 765 | // Assign sequence number here to prevent out of order packets |
767 | if (packet.Header.Sequence == 0) | 766 | if (packet.Header.Sequence == 0) |
768 | { | 767 | { |
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 | |||
413 | } | 413 | } |
414 | } | 414 | } |
415 | 415 | ||
416 | |||
417 | private static int ScaleThrottle(int value, int curmax, int newmax) | 416 | private static int ScaleThrottle(int value, int curmax, int newmax) |
418 | { | 417 | { |
419 | return (value / curmax) * newmax; | 418 | return (int)((value / (float)curmax) * newmax); |
420 | } | 419 | } |
421 | 420 | ||
422 | public byte[] GetThrottlesPacked(float multiplier) | 421 | public byte[] GetThrottlesPacked(float multiplier) |