diff options
| author | Melanie | 2010-10-04 00:04:42 +0200 |
|---|---|---|
| committer | Melanie | 2010-10-04 00:04:42 +0200 |
| commit | 50b03d08a8cdec9359adcece5b4645a6dc821d26 (patch) | |
| tree | 1970b3ac7b8390397d9d96acc4501d757c96ce00 /OpenSim/Region/ClientStack | |
| parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
| download | opensim-SC_OLD-50b03d08a8cdec9359adcece5b4645a6dc821d26.zip opensim-SC_OLD-50b03d08a8cdec9359adcece5b4645a6dc821d26.tar.gz opensim-SC_OLD-50b03d08a8cdec9359adcece5b4645a6dc821d26.tar.bz2 opensim-SC_OLD-50b03d08a8cdec9359adcece5b4645a6dc821d26.tar.xz | |
Add linden prim renderer and update libOMV
Diffstat (limited to 'OpenSim/Region/ClientStack')
| -rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/UnackedPacketCollection.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/UnackedPacketCollection.cs b/OpenSim/Region/ClientStack/LindenUDP/UnackedPacketCollection.cs index c120a12..043e7d3 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/UnackedPacketCollection.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/UnackedPacketCollection.cs | |||
| @@ -143,7 +143,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
| 143 | OutgoingPacket pendingAdd; | 143 | OutgoingPacket pendingAdd; |
| 144 | if (m_pendingAdds != null) | 144 | if (m_pendingAdds != null) |
| 145 | { | 145 | { |
| 146 | while (m_pendingAdds.Dequeue(out pendingAdd)) | 146 | while (m_pendingAdds.TryDequeue(out pendingAdd)) |
| 147 | { | 147 | { |
| 148 | if (pendingAdd != null && m_packets != null) | 148 | if (pendingAdd != null && m_packets != null) |
| 149 | { | 149 | { |
| @@ -157,7 +157,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
| 157 | OutgoingPacket ackedPacket; | 157 | OutgoingPacket ackedPacket; |
| 158 | if (m_pendingRemoves != null) | 158 | if (m_pendingRemoves != null) |
| 159 | { | 159 | { |
| 160 | while (m_pendingRemoves.Dequeue(out pendingRemove)) | 160 | while (m_pendingRemoves.TryDequeue(out pendingRemove)) |
| 161 | { | 161 | { |
| 162 | if (m_pendingRemoves != null && m_packets != null) | 162 | if (m_pendingRemoves != null && m_packets != null) |
| 163 | { | 163 | { |