Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
commit
8a5f9b91de
|
@ -3557,11 +3557,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
|||
if (maxUpdates <= 0) maxUpdates = Int32.MaxValue;
|
||||
int updatesThisCall = 0;
|
||||
|
||||
lock (m_entityUpdates.SyncRoot)
|
||||
{
|
||||
EntityUpdate update;
|
||||
while (updatesThisCall < maxUpdates && m_entityUpdates.TryDequeue(out update))
|
||||
while (updatesThisCall < maxUpdates)
|
||||
{
|
||||
lock (m_entityUpdates.SyncRoot)
|
||||
if (!m_entityUpdates.TryDequeue(out update))
|
||||
break;
|
||||
|
||||
if (update.Entity is SceneObjectPart)
|
||||
{
|
||||
SceneObjectPart part = (SceneObjectPart)update.Entity;
|
||||
|
@ -3751,7 +3753,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
|||
|
||||
OutPacket(packet, ThrottleOutPacketType.Task, true);
|
||||
}
|
||||
}
|
||||
|
||||
#endregion Packet Sending
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue