From 4a329098e8eba012cbf9f66627443968cbf9d726 Mon Sep 17 00:00:00 2001
From: Diva Canto <diva@metaverseink.com>
Date: Mon, 20 Feb 2012 11:12:02 -0800
Subject: [PATCH] Amend to last commit: synchronize access to queues.

---
 .../Connectors/Simulation/SimulationServiceConnector.cs    | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
index c45e312a49..65f01b39c5 100644
--- a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
@@ -215,8 +215,11 @@ namespace OpenSim.Services.Connectors.Simulation
             }
             // we get here iff success == false
             // blacklist sim for 2 minutes
-            _failedSims.AddOrUpdate(destination.ServerURI, true, 120);
-            m_updateAgentQueue.Clear();
+            lock (m_updateAgentQueue)
+            {
+                _failedSims.AddOrUpdate(destination.ServerURI, true, 120);
+                m_updateAgentQueue.Remove(uri);
+            }
             return false;
         }