2 files changed, 7 insertions, 23 deletions

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs
index bc75d82..e0cca05 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs
@@ -859,17 +859,17 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             switch (category)
             {
                 case ThrottleOutPacketType.Land:
-                    return ThrottleOutPacketTypeFlags.Land;
+                    return ThrottleOutPacketTypeFlags.Land; // Terrain data
                 case ThrottleOutPacketType.Wind:
-                    return ThrottleOutPacketTypeFlags.Wind;
+                    return ThrottleOutPacketTypeFlags.Wind; // Wind data
                 case ThrottleOutPacketType.Cloud:
-                    return ThrottleOutPacketTypeFlags.Cloud;
+                    return ThrottleOutPacketTypeFlags.Cloud; // Cloud data
                 case ThrottleOutPacketType.Task:
-                    return ThrottleOutPacketTypeFlags.Task;
+                    return ThrottleOutPacketTypeFlags.Task; // Object updates and everything not on the other categories
                 case ThrottleOutPacketType.Texture:
-                    return ThrottleOutPacketTypeFlags.Texture;
+                    return ThrottleOutPacketTypeFlags.Texture; // Textures data (also impacts http texture and mesh by default)
                 case ThrottleOutPacketType.Asset:
-                    return ThrottleOutPacketTypeFlags.Asset;
+                    return ThrottleOutPacketTypeFlags.Asset; // Non-texture Assets data
                 default:
                     return 0;
             }
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/OpenSimUDPBase.cs b/OpenSim/Region/ClientStack/Linden/UDP/OpenSimUDPBase.cs
index 0bfd86c..7f6a292 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/OpenSimUDPBase.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/OpenSimUDPBase.cs
@@ -182,22 +182,6 @@ namespace OpenMetaverse
                 try { m_udpSocket.Close(); } catch { }
         }
 
-        public UDPPacketBuffer GetNewUDPBuffer()
-        {
-            lock (m_udpBuffersPoolLock)
-            {
-                if (m_udpBuffersPoolPtr >= 0)
-                {
-                    UDPPacketBuffer buf = m_udpBuffersPool[m_udpBuffersPoolPtr];
-                    m_udpBuffersPool[m_udpBuffersPoolPtr] = null;
-                    m_udpBuffersPoolPtr--;
-                    buf.RemoteEndPoint = new IPEndPoint(IPAddress.Any, 0);
-                    return buf;
-                }
-            }
-            return new UDPPacketBuffer(new IPEndPoint(IPAddress.Any, 0));
-        }
-
         public UDPPacketBuffer GetNewUDPBuffer(IPEndPoint remoteEndpoint)
         {
             lock (m_udpBuffersPoolLock)
@@ -353,7 +337,7 @@ namespace OpenMetaverse
             if (!IsRunningInbound)
                 return;
 
-            UDPPacketBuffer buf = GetNewUDPBuffer();
+            UDPPacketBuffer buf = GetNewUDPBuffer(new IPEndPoint(IPAddress.Any, 0)); // we need a fresh one here, for now at least
             try
             {
                 // kick off an async read