* Changed the timing calculations for sending resends/acks/pings from per-client back to per-scene

* Testing a fix from Jim to make the cpu usage fix cleaner

1 files changed, 3 insertions, 3 deletions

diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 997f38c..91afa4d 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -3558,7 +3558,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     ProcessTextureRequests();
                     break;
                 case ThrottleOutPacketType.Task:
-                    if (Monitor.TryEnter(m_avatarTerseUpdates.SyncRoot, 1))
+                    if (Monitor.TryEnter(m_avatarTerseUpdates.SyncRoot))
                     {
                         try
                         {
@@ -3573,7 +3573,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     }
                     break;
                 case ThrottleOutPacketType.State:
-                    if (Monitor.TryEnter(m_primFullUpdates.SyncRoot, 1))
+                    if (Monitor.TryEnter(m_primFullUpdates.SyncRoot))
                     {
                         try
                         {
@@ -3586,7 +3586,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                         finally { Monitor.Exit(m_primFullUpdates.SyncRoot); }
                     }
 
-                    if (Monitor.TryEnter(m_primTerseUpdates.SyncRoot, 1))
+                    if (Monitor.TryEnter(m_primTerseUpdates.SyncRoot))
                     {
                         try
                         {