aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/OptionalModules/World/TreePopulator/TreePopulatorModule.cs10
1 files changed, 0 insertions, 10 deletions
diff --git a/OpenSim/Region/OptionalModules/World/TreePopulator/TreePopulatorModule.cs b/OpenSim/Region/OptionalModules/World/TreePopulator/TreePopulatorModule.cs
index 93a0bd6..a17eb41 100644
--- a/OpenSim/Region/OptionalModules/World/TreePopulator/TreePopulatorModule.cs
+++ b/OpenSim/Region/OptionalModules/World/TreePopulator/TreePopulatorModule.cs
@@ -717,16 +717,6 @@ namespace OpenSim.Region.OptionalModules.World.TreePopulator
717 // Delete tree and alert clients (not silent) 717 // Delete tree and alert clients (not silent)
718 m_scene.DeleteSceneObject(selectedTree.ParentGroup, false); 718 m_scene.DeleteSceneObject(selectedTree.ParentGroup, false);
719 copse.m_trees.Remove(selectedTree.ParentGroup.UUID); 719 copse.m_trees.Remove(selectedTree.ParentGroup.UUID);
720<<<<<<< HEAD:OpenSim/Region/OptionalModules/World/TreePopulator/TreePopulatorModule.cs
721
722 m_scene.ForEachClient(delegate(IClientAPI controller)
723 {
724 controller.SendKillObject(m_scene.RegionInfo.RegionHandle,
725 new List<uint>() { selectedTree.LocalId });
726 });
727
728=======
729>>>>>>> 146322eb34c15a5722cfe42dd012821ddf441fe6:OpenSim/Region/OptionalModules/World/TreePopulator/TreePopulatorModule.cs
730 break; 720 break;
731 } 721 }
732 } 722 }