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

1 files changed, 11 insertions, 4 deletions

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