aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Environment')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs11
1 files changed, 6 insertions, 5 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 7de6fd1..f686a9f 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -1826,11 +1826,12 @@ namespace OpenSim.Region.Environment.Scenes
1826 { 1826 {
1827 //SceneObjectPart rootPart = group.GetChildPart(group.UUID); 1827 //SceneObjectPart rootPart = group.GetChildPart(group.UUID);
1828 1828
1829 // Serialise calls to RemoveScriptInstances to avoid 1829 // Serialise calls to RemoveScriptInstances to avoid
1830 // deadlocking on m_parts inside SceneObjectGroup 1830 // deadlocking on m_parts inside SceneObjectGroup
1831 lock (m_deleting_scene_object) { 1831 lock (m_deleting_scene_object)
1832 group.RemoveScriptInstances(); 1832 {
1833 } 1833 group.RemoveScriptInstances();
1834 }
1834 1835
1835 foreach (SceneObjectPart part in group.Children.Values) 1836 foreach (SceneObjectPart part in group.Children.Values)
1836 { 1837 {