diff options
author | John Hurliman | 2010-09-07 14:41:13 -0700 |
---|---|---|
committer | John Hurliman | 2010-09-07 14:41:13 -0700 |
commit | 9be1c0ff448d4ea650ca921937905653b4017d61 (patch) | |
tree | 845b09cb064fb023993b559671ec22d4678d8c1b /OpenSim/Region/ClientStack | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC_OLD-9be1c0ff448d4ea650ca921937905653b4017d61.zip opensim-SC_OLD-9be1c0ff448d4ea650ca921937905653b4017d61.tar.gz opensim-SC_OLD-9be1c0ff448d4ea650ca921937905653b4017d61.tar.bz2 opensim-SC_OLD-9be1c0ff448d4ea650ca921937905653b4017d61.tar.xz |
* Cache null account responses in the SimianUserAccountServiceConnector to avoid repeated requests for missing avatar IDs
* Updated to OpenMetaverse r3442 to fix a timezone issue with ExpiringCache
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 6 | ||||
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/UnackedPacketCollection.cs | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index 9cdc80b..0925222 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||
@@ -3529,9 +3529,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
3529 | 3529 | ||
3530 | private void ProcessEntityUpdates(int maxUpdates) | 3530 | private void ProcessEntityUpdates(int maxUpdates) |
3531 | { | 3531 | { |
3532 | Lazy<List<ObjectUpdatePacket.ObjectDataBlock>> objectUpdateBlocks = new Lazy<List<ObjectUpdatePacket.ObjectDataBlock>>(); | 3532 | OpenMetaverse.Lazy<List<ObjectUpdatePacket.ObjectDataBlock>> objectUpdateBlocks = new OpenMetaverse.Lazy<List<ObjectUpdatePacket.ObjectDataBlock>>(); |
3533 | Lazy<List<ObjectUpdateCompressedPacket.ObjectDataBlock>> compressedUpdateBlocks = new Lazy<List<ObjectUpdateCompressedPacket.ObjectDataBlock>>(); | 3533 | OpenMetaverse.Lazy<List<ObjectUpdateCompressedPacket.ObjectDataBlock>> compressedUpdateBlocks = new OpenMetaverse.Lazy<List<ObjectUpdateCompressedPacket.ObjectDataBlock>>(); |
3534 | Lazy<List<ImprovedTerseObjectUpdatePacket.ObjectDataBlock>> terseUpdateBlocks = new Lazy<List<ImprovedTerseObjectUpdatePacket.ObjectDataBlock>>(); | 3534 | OpenMetaverse.Lazy<List<ImprovedTerseObjectUpdatePacket.ObjectDataBlock>> terseUpdateBlocks = new OpenMetaverse.Lazy<List<ImprovedTerseObjectUpdatePacket.ObjectDataBlock>>(); |
3535 | 3535 | ||
3536 | if (maxUpdates <= 0) maxUpdates = Int32.MaxValue; | 3536 | if (maxUpdates <= 0) maxUpdates = Int32.MaxValue; |
3537 | int updatesThisCall = 0; | 3537 | int updatesThisCall = 0; |
diff --git a/OpenSim/Region/ClientStack/LindenUDP/UnackedPacketCollection.cs b/OpenSim/Region/ClientStack/LindenUDP/UnackedPacketCollection.cs index e43f7cf..194c064 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/UnackedPacketCollection.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/UnackedPacketCollection.cs | |||
@@ -140,13 +140,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
140 | { | 140 | { |
141 | // Process all the pending adds | 141 | // Process all the pending adds |
142 | OutgoingPacket pendingAdd; | 142 | OutgoingPacket pendingAdd; |
143 | while (m_pendingAdds.Dequeue(out pendingAdd)) | 143 | while (m_pendingAdds.TryDequeue(out pendingAdd)) |
144 | m_packets[pendingAdd.SequenceNumber] = pendingAdd; | 144 | m_packets[pendingAdd.SequenceNumber] = pendingAdd; |
145 | 145 | ||
146 | // Process all the pending removes, including updating statistics and round-trip times | 146 | // Process all the pending removes, including updating statistics and round-trip times |
147 | PendingAck pendingRemove; | 147 | PendingAck pendingRemove; |
148 | OutgoingPacket ackedPacket; | 148 | OutgoingPacket ackedPacket; |
149 | while (m_pendingRemoves.Dequeue(out pendingRemove)) | 149 | while (m_pendingRemoves.TryDequeue(out pendingRemove)) |
150 | { | 150 | { |
151 | if (m_packets.TryGetValue(pendingRemove.SequenceNumber, out ackedPacket)) | 151 | if (m_packets.TryGetValue(pendingRemove.SequenceNumber, out ackedPacket)) |
152 | { | 152 | { |