1 files changed, 16 insertions, 4 deletions

diff --git a/OpenSim/Framework/AgentCircuitManager.cs b/OpenSim/Framework/AgentCircuitManager.cs
index 09333bd..56b40bd 100644
--- a/OpenSim/Framework/AgentCircuitManager.cs
+++ b/OpenSim/Framework/AgentCircuitManager.cs
@@ -81,13 +81,25 @@ namespace OpenSim.Framework
         /// <param name="agentData"></param>
         public virtual void AddNewCircuit(uint circuitCode, AgentCircuitData agentData)
         {
-            if (AgentCircuits.ContainsKey(circuitCode))
+            lock (AgentCircuits)
             {
-                AgentCircuits[circuitCode] = agentData;
+                if (AgentCircuits.ContainsKey(circuitCode))
+                {
+                    AgentCircuits[circuitCode] = agentData;
+                }
+                else
+                {
+                    AgentCircuits.Add(circuitCode, agentData);
+                }
             }
-            else
+        }
+
+        public virtual void RemoveCircuit(uint circuitCode)
+        {
+            lock (AgentCircuits)
             {
-                AgentCircuits.Add(circuitCode, agentData);
+                if (AgentCircuits.ContainsKey(circuitCode))
+                    AgentCircuits.Remove(circuitCode);
             }
         }