From 4206c1248f13ad24f3ebd03988a296fe1d8fe635 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Wed, 24 Sep 2014 01:51:36 +0100 Subject: [PATCH] same thing on another lock(acd) --- OpenSim/Region/Framework/Scenes/Scene.cs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 7eda4e487e..ff93941c43 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs @@ -3583,6 +3583,10 @@ namespace OpenSim.Region.Framework.Scenes /// /// Close the neighbour child agents associated with this client. /// + /// + + private object m_removeClientPrivLock = new Object(); + public void RemoveClient(UUID agentID, bool closeChildAgents) { AgentCircuitData acd = m_authenticateHandler.GetAgentCircuitData(agentID); @@ -3603,7 +3607,7 @@ namespace OpenSim.Region.Framework.Scenes } // TODO: Can we now remove this lock? - lock (acd) + lock (m_removeClientPrivLock) { bool isChildAgent = false;