aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorMelanie2011-11-06 20:43:49 +0000
committerMelanie2011-11-06 20:43:49 +0000
commit559e6e52f537c1f897ab166ce2e7790631fb82e3 (patch)
tree812a943bc37019e91c77f70b324df211e69720f7 /OpenSim/Region/Framework
parentConvert SendKillObject to take a list of uint rather than sending one (diff)
downloadopensim-SC_OLD-559e6e52f537c1f897ab166ce2e7790631fb82e3.zip
opensim-SC_OLD-559e6e52f537c1f897ab166ce2e7790631fb82e3.tar.gz
opensim-SC_OLD-559e6e52f537c1f897ab166ce2e7790631fb82e3.tar.bz2
opensim-SC_OLD-559e6e52f537c1f897ab166ce2e7790631fb82e3.tar.xz
Make the AsyncSceneObjectDeleter send a list of kills. This will make large
marquee-selected deletions of single prims or small link sets nearly instantaneous
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs8
1 files changed, 7 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs b/OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs
index 0ac3899..5dfd3e0 100644
--- a/OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs
+++ b/OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs
@@ -104,8 +104,14 @@ namespace OpenSim.Region.Framework.Scenes
104 // better than losing the object for now. 104 // better than losing the object for now.
105 if (permissionToDelete) 105 if (permissionToDelete)
106 { 106 {
107 List<uint> killIDs = new List<uint>();
108
107 foreach (SceneObjectGroup g in objectGroups) 109 foreach (SceneObjectGroup g in objectGroups)
108 g.DeleteGroupFromScene(false); 110 { killIDs.Add(g.LocalId);
111 g.DeleteGroupFromScene(true);
112 }
113
114 m_scene.SendKillObject(killIDs);
109 } 115 }
110 } 116 }
111 117