aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes
diff options
context:
space:
mode:
authorJeff Ames2008-11-11 00:52:47 +0000
committerJeff Ames2008-11-11 00:52:47 +0000
commit5276c4bdf81a7d0f0ff12f8573a9cbe51cdda8aa (patch)
tree2cba73fc21acdc7986233d5a540dd844b2df0870 /OpenSim/Region/Environment/Scenes
parent* Commit allows downloading of the .raw terrain from the estate tools. (diff)
downloadopensim-SC_OLD-5276c4bdf81a7d0f0ff12f8573a9cbe51cdda8aa.zip
opensim-SC_OLD-5276c4bdf81a7d0f0ff12f8573a9cbe51cdda8aa.tar.gz
opensim-SC_OLD-5276c4bdf81a7d0f0ff12f8573a9cbe51cdda8aa.tar.bz2
opensim-SC_OLD-5276c4bdf81a7d0f0ff12f8573a9cbe51cdda8aa.tar.xz
Update svn properties, minor formatting cleanup.
Diffstat (limited to 'OpenSim/Region/Environment/Scenes')
-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 {