Merge branch 'master' into careminster-presence-refactor

Integrate the next large patch.
Don't use this version, it has a ghost avatar issue. Next push
will fix it.

1 files changed, 3 insertions, 6 deletions

diff --git a/OpenSim/Region/OptionalModules/ContentManagementSystem/CMView.cs b/OpenSim/Region/OptionalModules/ContentManagementSystem/CMView.cs
index f75f40a..3807ccd 100644
--- a/OpenSim/Region/OptionalModules/ContentManagementSystem/CMView.cs
+++ b/OpenSim/Region/OptionalModules/ContentManagementSystem/CMView.cs
@@ -186,12 +186,9 @@ namespace OpenSim.Region.OptionalModules.ContentManagement
                 ((ContentManagementEntity)m_model.MetaEntityCollection.Entities[group.UUID]).SendFullDiffUpdateToAll();
 
             // Deal with new parts not revisioned that have been deleted.
-            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();
-            }
+            foreach (SceneObjectPart part in group.Parts)
+                if (m_model.MetaEntityCollection.Auras.ContainsKey(part.UUID))
+                    ((AuraMetaEntity)m_model.MetaEntityCollection.Auras[part.UUID]).HideFromAll();
         }
 
         public void SendMetaEntitiesToNewClient(IClientAPI client)