From 5d8638ed882681bdfac6c79015089bcaaedfc3ab Mon Sep 17 00:00:00 2001
From: unknown
Date: Wed, 12 May 2010 16:05:48 -0700
Subject: Minor tweak in ProcessEntityUpdates (mostly just confirming the git
push is working)
---
OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 6154da4..11dca8d 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -3476,13 +3476,16 @@ namespace OpenSim.Region.ClientStack.LindenUDP
Lazy<List<ObjectUpdateCompressedPacket.ObjectDataBlock>> compressedUpdateBlocks = new Lazy<List<ObjectUpdateCompressedPacket.ObjectDataBlock>>();
Lazy<List<ImprovedTerseObjectUpdatePacket.ObjectDataBlock>> terseUpdateBlocks = new Lazy<List<ImprovedTerseObjectUpdatePacket.ObjectDataBlock>>();
+ if (maxUpdates <= 0) maxUpdates = Int32.MaxValue;
int updatesThisCall = 0;
lock (m_entityUpdates.SyncRoot)
{
EntityUpdate update;
- while (m_entityUpdates.TryDequeue(out update))
+ while (updatesThisCall < maxUpdates && m_entityUpdates.TryDequeue(out update))
{
+ ++updatesThisCall;
+
#region UpdateFlags to packet type conversion
PrimUpdateFlags updateFlags = update.Flags;
@@ -3552,10 +3555,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
}
#endregion Block Construction
-
- ++updatesThisCall;
- if (maxUpdates > 0 && updatesThisCall >= maxUpdates)
- break;
}
}
--
cgit v1.1