From 9e5f5f3d807e0e5404ca92d5f40e275cb71dcc49 Mon Sep 17 00:00:00 2001
From: "Justin Clark-Casey (justincc)" <jjustincc@googlemail.com>
Date: Mon, 30 Jan 2012 19:21:58 +0000
Subject: [PATCH] lock SceneObjectGroupsByFullID in SceneGraph.ForEachSOG() to
 stop failure if SceneObjectGroupsByFullID is updated elsewhere at the same
 time.

---
 OpenSim/Region/Framework/Scenes/SceneGraph.cs | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index 6d8b12289b..0c22937f16 100644
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -1153,8 +1153,10 @@ namespace OpenSim.Region.Framework.Scenes
         /// <param name="action"></param>
         protected internal void ForEachSOG(Action<SceneObjectGroup> action)
         {
-            // FIXME: Need to lock here, really.
-            List<SceneObjectGroup> objlist = new List<SceneObjectGroup>(SceneObjectGroupsByFullID.Values);
+            List<SceneObjectGroup> objlist;
+            lock (SceneObjectGroupsByFullID)
+                objlist = new List<SceneObjectGroup>(SceneObjectGroupsByFullID.Values);
+
             foreach (SceneObjectGroup obj in objlist)
             {
                 try
@@ -1163,7 +1165,7 @@ namespace OpenSim.Region.Framework.Scenes
                 }
                 catch (Exception e)
                 {
-                    // Catch it and move on. This includes situations where splist has inconsistent info
+                    // Catch it and move on. This includes situations where objlist has inconsistent info
                     m_log.WarnFormat(
                         "[SCENEGRAPH]: Problem processing action in ForEachSOG: {0} {1}", e.Message, e.StackTrace);
                 }
@@ -1398,10 +1400,10 @@ namespace OpenSim.Region.Framework.Scenes
         /// <summary>
         /// Update the texture entry of the given prim.
         /// </summary>
-        /// 
+        /// <remarks>
         /// A texture entry is an object that contains details of all the textures of the prim's face.  In this case,
         /// the texture is given in its byte serialized form.
-        /// 
+        /// </remarks>
         /// <param name="localID"></param>
         /// <param name="texture"></param>
         /// <param name="remoteClient"></param>