Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor

1 files changed, 6 insertions, 3 deletions

diff --git a/OpenSim/Region/OptionalModules/ContentManagementSystem/CMView.cs b/OpenSim/Region/OptionalModules/ContentManagementSystem/CMView.cs
index 46fbd39..f75f40a 100644
--- a/OpenSim/Region/OptionalModules/ContentManagementSystem/CMView.cs
+++ b/OpenSim/Region/OptionalModules/ContentManagementSystem/CMView.cs
@@ -186,9 +186,12 @@ namespace OpenSim.Region.OptionalModules.ContentManagement
                 ((ContentManagementEntity)m_model.MetaEntityCollection.Entities[group.UUID]).SendFullDiffUpdateToAll();
 
             // Deal with new parts not revisioned that have been deleted.
-            foreach (SceneObjectPart part in group.Children.Values)
-                if (m_model.MetaEntityCollection.Auras.ContainsKey(part.UUID))
-                    ((AuraMetaEntity)m_model.MetaEntityCollection.Auras[part.UUID]).HideFromAll();
+            lock (group.Children)
+            {
+                foreach (SceneObjectPart part in group.Children.Values)
+                    if (m_model.MetaEntityCollection.Auras.ContainsKey(part.UUID))
+                        ((AuraMetaEntity)m_model.MetaEntityCollection.Auras[part.UUID]).HideFromAll();
+            }
         }
 
         public void SendMetaEntitiesToNewClient(IClientAPI client)