aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs11
1 files changed, 1 insertions, 10 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 9e59d50..3a066d4 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -219,8 +219,6 @@ namespace OpenSim.Region.Framework.Scenes
219 219
220 private int m_lastUpdate; 220 private int m_lastUpdate;
221 private bool m_firstHeartbeat = true; 221 private bool m_firstHeartbeat = true;
222
223 private object m_deleting_scene_object = new object();
224 222
225 private UpdatePrioritizationSchemes m_priorityScheme = UpdatePrioritizationSchemes.Time; 223 private UpdatePrioritizationSchemes m_priorityScheme = UpdatePrioritizationSchemes.Time;
226 private bool m_reprioritizationEnabled = true; 224 private bool m_reprioritizationEnabled = true;
@@ -1994,15 +1992,8 @@ namespace OpenSim.Region.Framework.Scenes
1994 public void DeleteSceneObject(SceneObjectGroup group, bool silent) 1992 public void DeleteSceneObject(SceneObjectGroup group, bool silent)
1995 { 1993 {
1996// m_log.DebugFormat("[SCENE]: Deleting scene object {0} {1}", group.Name, group.UUID); 1994// m_log.DebugFormat("[SCENE]: Deleting scene object {0} {1}", group.Name, group.UUID);
1997
1998 //SceneObjectPart rootPart = group.GetChildPart(group.UUID);
1999 1995
2000 // Serialise calls to RemoveScriptInstances to avoid 1996 group.RemoveScriptInstances(true);
2001 // deadlocking on m_parts inside SceneObjectGroup
2002 lock (m_deleting_scene_object)
2003 {
2004 group.RemoveScriptInstances(true);
2005 }
2006 1997
2007 SceneObjectPart[] partList = group.Parts; 1998 SceneObjectPart[] partList = group.Parts;
2008 1999