3 files changed, 16 insertions, 38 deletions

diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 91afa4d..0bb7a71 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -3558,45 +3558,23 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     ProcessTextureRequests();
                     break;
                 case ThrottleOutPacketType.Task:
-                    if (Monitor.TryEnter(m_avatarTerseUpdates.SyncRoot))
+                    lock (m_avatarTerseUpdates.SyncRoot)
                     {
-                        try
-                        {
-                            if (m_avatarTerseUpdates.Count > 0)
-                            {
-
-                                ProcessAvatarTerseUpdates();
-                                return;
-                            }
-                        }
-                        finally { Monitor.Exit(m_avatarTerseUpdates.SyncRoot); }
+                        if (m_avatarTerseUpdates.Count > 0)
+                            ProcessAvatarTerseUpdates();
                     }
                     break;
                 case ThrottleOutPacketType.State:
-                    if (Monitor.TryEnter(m_primFullUpdates.SyncRoot))
+                    lock (m_primFullUpdates.SyncRoot)
                     {
-                        try
-                        {
-                            if (m_primFullUpdates.Count > 0)
-                            {
-                                ProcessPrimFullUpdates();
-                                return;
-                            }
-                        }
-                        finally { Monitor.Exit(m_primFullUpdates.SyncRoot); }
+                        if (m_primFullUpdates.Count > 0)
+                            ProcessPrimFullUpdates();
                     }
 
-                    if (Monitor.TryEnter(m_primTerseUpdates.SyncRoot))
+                    lock (m_primTerseUpdates.SyncRoot)
                     {
-                        try
-                        {
-                            if (m_primTerseUpdates.Count > 0)
-                            {
-                                ProcessPrimTerseUpdates();
-                                return;
-                            }
-                        }
-                        finally { Monitor.Exit(m_primTerseUpdates.SyncRoot); }
+                        if (m_primTerseUpdates.Count > 0)
+                            ProcessPrimTerseUpdates();
                     }
                     break;
             }
@@ -10344,7 +10322,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                         {
                             if (lookup.Heap.ContainsHandle(lookup.Handle))
                                 lookup.Heap[lookup.Handle] =
-                                    new MinHeapItem(priority, item.Value, item.LocalID);
+                                    new MinHeapItem(priority, item.Value, item.LocalID, this.m_comparison);
                         }
                         else
                         {
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPClient.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPClient.cs
index 0a090b4..71f4c47 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPClient.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPClient.cs
@@ -535,14 +535,18 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             ThrottleOutPacketType type = (ThrottleOutPacketType)i;
             QueueEmpty callback = OnQueueEmpty;
 
+            int start = Environment.TickCount;
+
             if (callback != null)
             {
                 try { callback(type); }
                 catch (Exception e) { m_log.Error("[LLUDPCLIENT]: OnQueueEmpty(" + type + ") threw an exception: " + e.Message, e); }
             }
 
-            // HACK: Try spending some extra time here to slow down OnQueueEmpty calls
-            //System.Threading.Thread.Sleep(100);
+            // Make sure all queue empty calls take at least a measurable amount of time,
+            // otherwise we'll peg a CPU trying to fire these too fast
+            if (Environment.TickCount == start)
+                System.Threading.Thread.Sleep((int)m_udpServer.TickCountResolution);
 
             m_onQueueEmptyRunning[i] = false;
         }
diff --git a/OpenSim/Region/ClientStack/LindenUDP/UnackedPacketCollection.cs b/OpenSim/Region/ClientStack/LindenUDP/UnackedPacketCollection.cs
index bd5fe1c..016712f 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/UnackedPacketCollection.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/UnackedPacketCollection.cs
@@ -125,10 +125,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                             expiredPackets = new List<OutgoingPacket>();
                         expiredPackets.Add(packet);
                     }
-                    /*else
-                    {
-                        break;
-                    }*/
                 }
             }