diff options
author | Justin Clark-Casey (justincc) | 2011-08-31 16:41:58 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-08-31 16:41:58 +0100 |
commit | 5a5206449f575fa4c6e161aea7202b7b8f628b4a (patch) | |
tree | d1aa2ff5e1bd8cc05a0bb3b93ef945bb54e49b0c | |
parent | Make SP.Attachments available as sp.GetAttachments() instead. (diff) | |
download | opensim-SC_OLD-5a5206449f575fa4c6e161aea7202b7b8f628b4a.zip opensim-SC_OLD-5a5206449f575fa4c6e161aea7202b7b8f628b4a.tar.gz opensim-SC_OLD-5a5206449f575fa4c6e161aea7202b7b8f628b4a.tar.bz2 opensim-SC_OLD-5a5206449f575fa4c6e161aea7202b7b8f628b4a.tar.xz |
minor: seal up another instance of using the appearance list without locking
-rw-r--r-- | OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 3 |
2 files changed, 3 insertions, 2 deletions
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 | |||
366 | break; | 366 | break; |
367 | } | 367 | } |
368 | } | 368 | } |
369 | 369 | ||
370 | return true; | 370 | return true; |
371 | } | 371 | } |
372 | 372 | ||
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 | |||
3512 | 3512 | ||
3513 | public bool HasAttachments() | 3513 | public bool HasAttachments() |
3514 | { | 3514 | { |
3515 | return m_attachments.Count > 0; | 3515 | lock (m_attachments) |
3516 | return m_attachments.Count > 0; | ||
3516 | } | 3517 | } |
3517 | 3518 | ||
3518 | public bool HasScriptedAttachments() | 3519 | public bool HasScriptedAttachments() |