1 files changed, 7 insertions, 1 deletions

diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 6634028..f1c4c6c 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -164,6 +164,8 @@ namespace OpenSim.Region.Environment.Scenes
         private Thread HeartbeatThread;
         private volatile bool shuttingdown = false;
 
+        private object m_deleting_scene_object = new object();
+
         #endregion
 
         #region Properties
@@ -1824,7 +1826,11 @@ namespace OpenSim.Region.Environment.Scenes
         {
             //SceneObjectPart rootPart = group.GetChildPart(group.UUID);
 
-            group.RemoveScriptInstances();
+            // Serialise calls to RemoveScriptInstances to avoid
+            // deadlocking on m_parts inside SceneObjectGroup
+            lock (m_deleting_scene_object) {
+                group.RemoveScriptInstances();
+            }
 
             foreach (SceneObjectPart part in group.Children.Values)
             {