aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Framework')
-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 a3358a5..de1517b 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -227,8 +227,6 @@ namespace OpenSim.Region.Framework.Scenes
227 private bool m_firstHeartbeat = true; 227 private bool m_firstHeartbeat = true;
228 private int m_hbRestarts = 0; 228 private int m_hbRestarts = 0;
229 229
230 private object m_deleting_scene_object = new object();
231
232 private UpdatePrioritizationSchemes m_priorityScheme = UpdatePrioritizationSchemes.Time; 230 private UpdatePrioritizationSchemes m_priorityScheme = UpdatePrioritizationSchemes.Time;
233 private bool m_reprioritizationEnabled = true; 231 private bool m_reprioritizationEnabled = true;
234 private double m_reprioritizationInterval = 5000.0; 232 private double m_reprioritizationInterval = 5000.0;
@@ -2085,15 +2083,8 @@ namespace OpenSim.Region.Framework.Scenes
2085 public void DeleteSceneObject(SceneObjectGroup group, bool silent) 2083 public void DeleteSceneObject(SceneObjectGroup group, bool silent)
2086 { 2084 {
2087// m_log.DebugFormat("[SCENE]: Deleting scene object {0} {1}", group.Name, group.UUID); 2085// m_log.DebugFormat("[SCENE]: Deleting scene object {0} {1}", group.Name, group.UUID);
2088
2089 //SceneObjectPart rootPart = group.GetChildPart(group.UUID);
2090 2086
2091 // Serialise calls to RemoveScriptInstances to avoid 2087 group.RemoveScriptInstances(true);
2092 // deadlocking on m_parts inside SceneObjectGroup
2093 lock (m_deleting_scene_object)
2094 {
2095 group.RemoveScriptInstances(true);
2096 }
2097 2088
2098 SceneObjectPart[] partList = group.Parts; 2089 SceneObjectPart[] partList = group.Parts;
2099 2090