From d96fe6eaf55974f01d430d560d457c8faa51c9a6 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Wed, 24 Sep 2014 01:37:51 +0100 Subject: [PATCH] replace a lock on a unkown origin object with a lock on a well defined one. --- OpenSim/Region/Framework/Scenes/Scene.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 8cb795d8bd..7eda4e487e 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs @@ -3803,6 +3803,9 @@ namespace OpenSim.Region.Framework.Scenes /// or other applications where a full grid/Hypergrid presence may not be required. /// True if the region accepts this agent. False if it does not. False will /// also return a reason. + /// + private object m_newUserConnLock = new object(); + public bool NewUserConnection(AgentCircuitData acd, uint teleportFlags, out string reason, bool requirePresenceLookup) { bool vialogin = ((teleportFlags & (uint)TPFlags.ViaLogin) != 0 || @@ -3961,7 +3964,7 @@ namespace OpenSim.Region.Framework.Scenes } // TODO: can we remove this lock? - lock (acd) + lock (m_newUserConnLock) { if (sp != null && !sp.IsChildAgent) {