Merge branch 'master' into careminster

Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
2026-08-05 17:05:55 +08:00 · 2012-10-28 18:43:28 +00:00
parent 42cd27c46a 5a96ef52cb
commit 502efdb894
1 changed files with 4 additions and 1 deletions
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -1750,7 +1750,10 @@ namespace OpenSim.Region.Framework.Scenes
        {
            List<SceneObjectGroup> objs = new List<SceneObjectGroup>();
            lock (m_groupsWithTargets)
-                objs = new List<SceneObjectGroup>(m_groupsWithTargets.Values);
+            {
+                foreach (SceneObjectGroup grp in m_groupsWithTargets.Values)
+                    objs.Add(grp);
+            }

            foreach (SceneObjectGroup entry in objs)
                entry.checkAtTargets();