Changed the lock object, to see if this helps at all. Also switched the order of lock and try/catch in RemoveImageFromQueue.
parent
2a19187e01
commit
05c1ec7faf
|
@ -88,7 +88,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
|||
J2KImage imgrequest;
|
||||
|
||||
// Do a linear search for this texture download
|
||||
lock (m_priorityQueue)
|
||||
lock (m_syncRoot)
|
||||
m_priorityQueue.Find(delegate(J2KImage img) { return img.TextureID == newRequest.RequestedAssetID; }, out imgrequest);
|
||||
|
||||
if (imgrequest != null)
|
||||
|
@ -99,7 +99,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
|||
|
||||
try
|
||||
{
|
||||
lock (m_priorityQueue)
|
||||
lock (m_syncRoot)
|
||||
m_priorityQueue.Delete(imgrequest.PriorityQueueHandle);
|
||||
}
|
||||
catch (Exception) { }
|
||||
|
@ -211,7 +211,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
|||
{
|
||||
J2KImage image = null;
|
||||
|
||||
lock (m_priorityQueue)
|
||||
lock (m_syncRoot)
|
||||
{
|
||||
|
||||
if (m_priorityQueue.Count > 0)
|
||||
|
@ -230,15 +230,19 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
|||
{
|
||||
image.PriorityQueueHandle = null;
|
||||
|
||||
lock (m_priorityQueue)
|
||||
lock (m_syncRoot)
|
||||
try
|
||||
{
|
||||
m_priorityQueue.Add(ref image.PriorityQueueHandle, image);
|
||||
}
|
||||
catch (Exception) { }
|
||||
}
|
||||
|
||||
void RemoveImageFromQueue(J2KImage image)
|
||||
{
|
||||
lock (m_syncRoot)
|
||||
try
|
||||
{
|
||||
lock (m_priorityQueue)
|
||||
m_priorityQueue.Delete(image.PriorityQueueHandle);
|
||||
}
|
||||
catch (Exception) { }
|
||||
|
@ -246,7 +250,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
|||
|
||||
void UpdateImageInQueue(J2KImage image)
|
||||
{
|
||||
lock (m_priorityQueue)
|
||||
lock (m_syncRoot)
|
||||
{
|
||||
try { m_priorityQueue.Replace(image.PriorityQueueHandle, image); }
|
||||
catch (Exception)
|
||||
|
|
Loading…
Reference in New Issue