From 6dd454240fb962a408c979060701531f0f458e8e Mon Sep 17 00:00:00 2001
From: dahlia
Date: Tue, 16 Jul 2013 02:03:01 -0700
Subject: revert last commit which seems to conflict with DoubleQueue
 internals. The random crash might be in DoubleQueue instead. See
 http://pastebin.com/XhNBNqsc

---
 .../ClientStack/Linden/Caps/WebFetchInvDescModule.cs      | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

(limited to 'OpenSim/Region/ClientStack/Linden/Caps')

diff --git a/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
index 4ff617f..164adeb 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
@@ -254,13 +254,10 @@ namespace OpenSim.Region.ClientStack.Linden
                         }
                     }
 
-                    lock (m_queue)
-                    {
-                        if (highPriority)
-                            m_queue.EnqueueHigh(reqinfo);
-                        else
-                            m_queue.EnqueueLow(reqinfo);
-                    }
+                    if (highPriority)
+                        m_queue.EnqueueHigh(reqinfo);
+                    else
+                        m_queue.EnqueueLow(reqinfo);
                 };
 
                 NoEvents = (x, y) =>
@@ -348,9 +345,7 @@ namespace OpenSim.Region.ClientStack.Linden
             {
                 Watchdog.UpdateThread();
 
-                aPollRequest poolreq = null;
-                lock (m_queue)
-                    poolreq = m_queue.Dequeue();
+                aPollRequest poolreq = m_queue.Dequeue();
 
                 if (poolreq != null && poolreq.thepoll != null)
                     poolreq.thepoll.Process(poolreq);
-- 
cgit v1.1