Merge branch 'master' into careminster-presence-refactor

This was rather conflicted. Please test linking.

1 files changed, 12 insertions, 7 deletions

diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs
index 96cccb7..34171b0 100644
--- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs
@@ -185,14 +185,19 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
             get
             {
                 SceneObjectPart my = GetSOP();
-                int total = my.ParentGroup.Children.Count;
-
-                IObject[] rets = new IObject[total];
-
-                int i = 0;
-                foreach (KeyValuePair<UUID, SceneObjectPart> pair in my.ParentGroup.Children)
+                IObject[] rets = null;
+                
+                lock (my.ParentGroup.Children)
                 {
-                    rets[i++] = new SOPObject(m_rootScene, pair.Value.LocalId, m_security);
+                    int total = my.ParentGroup.Children.Count;
+    
+                    rets = new IObject[total];
+    
+                    int i = 0;
+                    foreach (KeyValuePair<UUID, SceneObjectPart> pair in my.ParentGroup.Children)
+                    {
+                        rets[i++] = new SOPObject(m_rootScene, pair.Value.LocalId, m_security);
+                    }
                 }
 
                 return rets;