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, 7 deletions

diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
index 7c95658..6f7256e 100644
--- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
@@ -586,13 +586,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
             so.RootPart.AttachedAvatar = avatar.UUID;
 
             //Anakin Lohner bug #3839 
-            lock (so.Children)
-            {
-                foreach (SceneObjectPart p in so.Children.Values)
-                {
-                    p.AttachedAvatar = avatar.UUID;
-                }
-            }
+            SceneObjectPart[] parts = so.Parts;
+            for (int i = 0; i < parts.Length; i++)
+                parts[i].AttachedAvatar = avatar.UUID;
 
             if (so.RootPart.PhysActor != null)
             {