diff options
| author | Melanie | 2011-10-12 01:55:12 +0200 |
|---|---|---|
| committer | Melanie | 2011-10-12 01:55:12 +0200 |
| commit | 1ebfd2fb686960dc22082f57e2d9660a3d13d3b1 (patch) | |
| tree | 9f9a117475a44c1ba9d859beef8beb0499612d63 /OpenSim | |
| parent | Merge commit '77b8fb0f86cd0342fa7331f04f56c0b5980290c2' into bigmerge (diff) | |
| download | opensim-SC-1ebfd2fb686960dc22082f57e2d9660a3d13d3b1.zip opensim-SC-1ebfd2fb686960dc22082f57e2d9660a3d13d3b1.tar.gz opensim-SC-1ebfd2fb686960dc22082f57e2d9660a3d13d3b1.tar.bz2 opensim-SC-1ebfd2fb686960dc22082f57e2d9660a3d13d3b1.tar.xz | |
Fix tree populator
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/OptionalModules/World/TreePopulator/TreePopulatorModule.cs | 10 |
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 | } |