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, 1 insertions, 4 deletions

diff --git a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
index 7788e43..4d97db7 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
@@ -161,11 +161,8 @@ namespace OpenSim.Region.Framework.Scenes
                         bool foundPrim = false;
                         
                         SceneObjectGroup sog = ent as SceneObjectGroup;
-                        
-                        List<SceneObjectPart> partList = null;
-                        lock (sog.Children)
-                            partList = new List<SceneObjectPart>(sog.Children.Values);
 
+                        SceneObjectPart[] partList = sog.Parts;
                         foreach (SceneObjectPart part in partList)
                         {
                             if (part.LocalId == primLocalID)