ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-11 20:05:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Only send one kill object to the deleter when they derez an object rather than two.

Browse Source 
Extend regression test to check this.
This commit is contained in:
Justin Clark-Casey (justincc)
2013-05-09 18:53:34 +01:00
parent 3290cd09d3
commit b4a6f2195d
2 changed files with 12 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs
View File

@@ -104,14 +104,8 @@ namespace OpenSim.Region.Framework.Scenes
// better than losing the object for now.
if (permissionToDelete)
{
List<uint> killIDs = new List<uint>();
foreach (SceneObjectGroup g in objectGroups)
{ killIDs.Add(g.LocalId);
g.DeleteGroupFromScene(true);
}
m_scene.SendKillObject(killIDs);
g.DeleteGroupFromScene(false);
}
}
@@ -160,7 +154,7 @@ namespace OpenSim.Region.Framework.Scenes
if (x.permissionToDelete)
{
foreach (SceneObjectGroup g in x.objectGroups)
m_scene.DeleteSceneObject(g, false);
m_scene.DeleteSceneObject(g, true);
}
}
catch (Exception e)