From 5a5206449f575fa4c6e161aea7202b7b8f628b4a Mon Sep 17 00:00:00 2001 From: Justin Clark-Casey (justincc) Date: Wed, 31 Aug 2011 16:41:58 +0100 Subject: minor: seal up another instance of using the appearance list without locking --- OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs | 2 +- OpenSim/Region/Framework/Scenes/ScenePresence.cs | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'OpenSim') diff --git a/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs b/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs index 057500c..f25699b 100644 --- a/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs +++ b/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs @@ -366,7 +366,7 @@ namespace OpenSim.Region.CoreModules.Scripting.WorldComm break; } } - + return true; } diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index f5c72e1..e3b7c72 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs @@ -3512,7 +3512,8 @@ namespace OpenSim.Region.Framework.Scenes public bool HasAttachments() { - return m_attachments.Count > 0; + lock (m_attachments) + return m_attachments.Count > 0; } public bool HasScriptedAttachments() -- cgit v1.1