From 146322eb34c15a5722cfe42dd012821ddf441fe6 Mon Sep 17 00:00:00 2001 From: Dan Lake Date: Tue, 4 Oct 2011 16:59:05 -0700 Subject: [PATCH] Removed redundant IClientAPI calls from TreePopulatorModule. Removing tree objects already triggers objectkill packet to client. No need to send again. --- .../World/TreePopulator/TreePopulatorModule.cs | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/OpenSim/Region/OptionalModules/World/TreePopulator/TreePopulatorModule.cs b/OpenSim/Region/OptionalModules/World/TreePopulator/TreePopulatorModule.cs index feca7d3ff0..a17eb41740 100644 --- a/OpenSim/Region/OptionalModules/World/TreePopulator/TreePopulatorModule.cs +++ b/OpenSim/Region/OptionalModules/World/TreePopulator/TreePopulatorModule.cs @@ -380,13 +380,8 @@ namespace OpenSim.Region.OptionalModules.World.TreePopulator if (m_scene.Entities.ContainsKey(tree)) { SceneObjectPart selectedTree = ((SceneObjectGroup)m_scene.Entities[tree]).RootPart; - + // Delete tree and alert clients (not silent) m_scene.DeleteSceneObject(selectedTree.ParentGroup, false); - m_scene.ForEachClient(delegate(IClientAPI controller) - { - controller.SendKillObject(m_scene.RegionInfo.RegionHandle, - selectedTree.LocalId); - }); } else { @@ -719,16 +714,9 @@ namespace OpenSim.Region.OptionalModules.World.TreePopulator if (Util.RandomClass.NextDouble() < killLikelyhood) { - + // Delete tree and alert clients (not silent) m_scene.DeleteSceneObject(selectedTree.ParentGroup, false); copse.m_trees.Remove(selectedTree.ParentGroup.UUID); - - m_scene.ForEachClient(delegate(IClientAPI controller) - { - controller.SendKillObject(m_scene.RegionInfo.RegionHandle, - selectedTree.LocalId); - }); - break; } }