diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs b/OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs index 25542ab..d25bf95 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs | |||
@@ -184,7 +184,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
184 | { | 184 | { |
185 | int sent; | 185 | int sent; |
186 | bool imageDone = image.SendPackets(m_client, packetsToSend - packetsSent, out sent); | 186 | bool imageDone = image.SendPackets(m_client, packetsToSend - packetsSent, out sent); |
187 | |||
188 | packetsSent += sent; | 187 | packetsSent += sent; |
189 | 188 | ||
190 | // If the send is complete, destroy any knowledge of this transfer | 189 | // If the send is complete, destroy any knowledge of this transfer |
@@ -234,20 +233,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
234 | image.PriorityQueueHandle = null; | 233 | image.PriorityQueueHandle = null; |
235 | 234 | ||
236 | lock (m_syncRoot) | 235 | lock (m_syncRoot) |
237 | try | 236 | try { m_priorityQueue.Add(ref image.PriorityQueueHandle, image); } |
238 | { | ||
239 | m_priorityQueue.Add(ref image.PriorityQueueHandle, image); | ||
240 | } | ||
241 | catch (Exception) { } | 237 | catch (Exception) { } |
242 | } | 238 | } |
243 | 239 | ||
244 | void RemoveImageFromQueue(J2KImage image) | 240 | void RemoveImageFromQueue(J2KImage image) |
245 | { | 241 | { |
246 | lock (m_syncRoot) | 242 | lock (m_syncRoot) |
247 | try | 243 | try { m_priorityQueue.Delete(image.PriorityQueueHandle); } |
248 | { | ||
249 | m_priorityQueue.Delete(image.PriorityQueueHandle); | ||
250 | } | ||
251 | catch (Exception) { } | 244 | catch (Exception) { } |
252 | } | 245 | } |
253 | 246 | ||