Improve consistency of locking for SOG.m_parts in order to avoid race conditions in linking and unlinking

1 files changed, 6 insertions, 3 deletions

diff --git a/OpenSim/Data/SQLite/SQLiteRegionData.cs b/OpenSim/Data/SQLite/SQLiteRegionData.cs
index 4208050..bfd8279 100644
--- a/OpenSim/Data/SQLite/SQLiteRegionData.cs
+++ b/OpenSim/Data/SQLite/SQLiteRegionData.cs
@@ -360,10 +360,13 @@ namespace OpenSim.Data.SQLite
 
             lock (ds)
             {
-                foreach (SceneObjectPart prim in obj.Children.Values)
+                lock (obj.Children)
                 {
-//                    m_log.Info("[REGION DB]: Adding obj: " + obj.UUID + " to region: " + regionUUID);
-                    addPrim(prim, obj.UUID, regionUUID);
+                    foreach (SceneObjectPart prim in obj.Children.Values)
+                    {
+    //                    m_log.Info("[REGION DB]: Adding obj: " + obj.UUID + " to region: " + regionUUID);
+                        addPrim(prim, obj.UUID, regionUUID);
+                    }
                 }
             }