aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-05-24 18:17:31 +0000
committerJustin Clarke Casey2008-05-24 18:17:31 +0000
commit0b7f82153beea3027313d64378f757a89174ece1 (patch)
treef6b9b7d8d3b29d8267344bc6714a741d7eb661e8 /OpenSim/Region/ClientStack
parentThis enables return from the parcel object owner display. (diff)
downloadopensim-SC_OLD-0b7f82153beea3027313d64378f757a89174ece1.zip
opensim-SC_OLD-0b7f82153beea3027313d64378f757a89174ece1.tar.gz
opensim-SC_OLD-0b7f82153beea3027313d64378f757a89174ece1.tar.bz2
opensim-SC_OLD-0b7f82153beea3027313d64378f757a89174ece1.tar.xz
* Temporary fix for mantis 1374
* If the agent throttle byte array is unexpectedly empty, then log a warning and drop the packet
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs12
1 files changed, 11 insertions, 1 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs b/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs
index 8655d80..fb14a35 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs
@@ -40,7 +40,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
40{ 40{
41 public class LLPacketQueue : IPullStatsProvider 41 public class LLPacketQueue : IPullStatsProvider
42 { 42 {
43 //private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 43 private static readonly log4net.ILog m_log
44 = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
44 45
45 private bool m_enabled = true; 46 private bool m_enabled = true;
46 47
@@ -415,6 +416,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP
415 416
416 public void SetThrottleFromClient(byte[] throttle) 417 public void SetThrottleFromClient(byte[] throttle)
417 { 418 {
419 // From mantis http://opensimulator.org/mantis/view.php?id=1374
420 // it appears that sometimes we are receiving empty throttle byte arrays.
421 // TODO: Investigate this behaviour
422 if (throttle.Length == 0)
423 {
424 m_log.Warn("[PACKET QUEUE]: SetThrottleFromClient unexpectedly received a throttle byte array containing no elements!");
425 return;
426 }
427
418 int tResend = -1; 428 int tResend = -1;
419 int tLand = -1; 429 int tLand = -1;
420 int tWind = -1; 430 int tWind = -1;