Removed redundant IClientAPI calls from TreePopulatorModule. Removing tree objects already triggers objectkill packet to client. No need to send again.
parent
92c88121c7
commit
146322eb34
|
@ -380,13 +380,8 @@ namespace OpenSim.Region.OptionalModules.World.TreePopulator
|
||||||
if (m_scene.Entities.ContainsKey(tree))
|
if (m_scene.Entities.ContainsKey(tree))
|
||||||
{
|
{
|
||||||
SceneObjectPart selectedTree = ((SceneObjectGroup)m_scene.Entities[tree]).RootPart;
|
SceneObjectPart selectedTree = ((SceneObjectGroup)m_scene.Entities[tree]).RootPart;
|
||||||
|
// Delete tree and alert clients (not silent)
|
||||||
m_scene.DeleteSceneObject(selectedTree.ParentGroup, false);
|
m_scene.DeleteSceneObject(selectedTree.ParentGroup, false);
|
||||||
m_scene.ForEachClient(delegate(IClientAPI controller)
|
|
||||||
{
|
|
||||||
controller.SendKillObject(m_scene.RegionInfo.RegionHandle,
|
|
||||||
selectedTree.LocalId);
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@ -719,16 +714,9 @@ namespace OpenSim.Region.OptionalModules.World.TreePopulator
|
||||||
|
|
||||||
if (Util.RandomClass.NextDouble() < killLikelyhood)
|
if (Util.RandomClass.NextDouble() < killLikelyhood)
|
||||||
{
|
{
|
||||||
|
// Delete tree and alert clients (not silent)
|
||||||
m_scene.DeleteSceneObject(selectedTree.ParentGroup, false);
|
m_scene.DeleteSceneObject(selectedTree.ParentGroup, false);
|
||||||
copse.m_trees.Remove(selectedTree.ParentGroup.UUID);
|
copse.m_trees.Remove(selectedTree.ParentGroup.UUID);
|
||||||
|
|
||||||
m_scene.ForEachClient(delegate(IClientAPI controller)
|
|
||||||
{
|
|
||||||
controller.SendKillObject(m_scene.RegionInfo.RegionHandle,
|
|
||||||
selectedTree.LocalId);
|
|
||||||
});
|
|
||||||
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue