diff options
author | UbitUmarov | 2014-09-24 01:51:36 +0100 |
---|---|---|
committer | UbitUmarov | 2014-09-24 01:51:36 +0100 |
commit | 4206c1248f13ad24f3ebd03988a296fe1d8fe635 (patch) | |
tree | c91a29e13ad7c3f48dd3c40417b01185fa270056 /OpenSim | |
parent | replace a lock on a unkown origin object with a lock on a well defined (diff) | |
download | opensim-SC-4206c1248f13ad24f3ebd03988a296fe1d8fe635.zip opensim-SC-4206c1248f13ad24f3ebd03988a296fe1d8fe635.tar.gz opensim-SC-4206c1248f13ad24f3ebd03988a296fe1d8fe635.tar.bz2 opensim-SC-4206c1248f13ad24f3ebd03988a296fe1d8fe635.tar.xz |
same thing on another lock(acd)
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 7eda4e4..ff93941 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -3583,6 +3583,10 @@ namespace OpenSim.Region.Framework.Scenes | |||
3583 | /// <param name='closeChildAgents'> | 3583 | /// <param name='closeChildAgents'> |
3584 | /// Close the neighbour child agents associated with this client. | 3584 | /// Close the neighbour child agents associated with this client. |
3585 | /// </param> | 3585 | /// </param> |
3586 | /// | ||
3587 | |||
3588 | private object m_removeClientPrivLock = new Object(); | ||
3589 | |||
3586 | public void RemoveClient(UUID agentID, bool closeChildAgents) | 3590 | public void RemoveClient(UUID agentID, bool closeChildAgents) |
3587 | { | 3591 | { |
3588 | AgentCircuitData acd = m_authenticateHandler.GetAgentCircuitData(agentID); | 3592 | AgentCircuitData acd = m_authenticateHandler.GetAgentCircuitData(agentID); |
@@ -3603,7 +3607,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
3603 | } | 3607 | } |
3604 | 3608 | ||
3605 | // TODO: Can we now remove this lock? | 3609 | // TODO: Can we now remove this lock? |
3606 | lock (acd) | 3610 | lock (m_removeClientPrivLock) |
3607 | { | 3611 | { |
3608 | bool isChildAgent = false; | 3612 | bool isChildAgent = false; |
3609 | 3613 | ||