aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules/World/TreePopulator
diff options
context:
space:
mode:
authorMelanie2011-10-12 01:31:34 +0100
committerMelanie2011-10-12 01:31:34 +0100
commitf5e78ca6166b13f2b1d60498f6b1918a22b5112b (patch)
tree5b20bed3d2efd857feb1f7addb0ff6e882ab89df /OpenSim/Region/OptionalModules/World/TreePopulator
parentMerge commit '9a49b3b5197f41353c32443dbc5432a4bcd58958' into bigmerge (diff)
parentRemoved redundant IClientAPI calls from TreePopulatorModule. Removing tree ob... (diff)
downloadopensim-SC-f5e78ca6166b13f2b1d60498f6b1918a22b5112b.zip
opensim-SC-f5e78ca6166b13f2b1d60498f6b1918a22b5112b.tar.gz
opensim-SC-f5e78ca6166b13f2b1d60498f6b1918a22b5112b.tar.bz2
opensim-SC-f5e78ca6166b13f2b1d60498f6b1918a22b5112b.tar.xz
Merge commit '146322eb34c15a5722cfe42dd012821ddf441fe6' into bigmerge
Conflicts: OpenSim/Region/OptionalModules/World/TreePopulator/TreePopulatorModule.cs
Diffstat (limited to 'OpenSim/Region/OptionalModules/World/TreePopulator')
-rw-r--r--OpenSim/Region/OptionalModules/World/TreePopulator/TreePopulatorModule.cs12
1 files changed, 5 insertions, 7 deletions
diff --git a/OpenSim/Region/OptionalModules/World/TreePopulator/TreePopulatorModule.cs b/OpenSim/Region/OptionalModules/World/TreePopulator/TreePopulatorModule.cs
index 38c2f7b..93a0bd6 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
380 if (m_scene.Entities.ContainsKey(tree)) 380 if (m_scene.Entities.ContainsKey(tree))
381 { 381 {
382 SceneObjectPart selectedTree = ((SceneObjectGroup)m_scene.Entities[tree]).RootPart; 382 SceneObjectPart selectedTree = ((SceneObjectGroup)m_scene.Entities[tree]).RootPart;
383 383 // Delete tree and alert clients (not silent)
384 m_scene.DeleteSceneObject(selectedTree.ParentGroup, false); 384 m_scene.DeleteSceneObject(selectedTree.ParentGroup, false);
385 m_scene.ForEachClient(delegate(IClientAPI controller)
386 {
387 controller.SendKillObject(m_scene.RegionInfo.RegionHandle,
388 new List<uint>() { selectedTree.LocalId });
389 });
390 } 385 }
391 else 386 else
392 { 387 {
@@ -719,9 +714,10 @@ namespace OpenSim.Region.OptionalModules.World.TreePopulator
719 714
720 if (Util.RandomClass.NextDouble() < killLikelyhood) 715 if (Util.RandomClass.NextDouble() < killLikelyhood)
721 { 716 {
722 717 // Delete tree and alert clients (not silent)
723 m_scene.DeleteSceneObject(selectedTree.ParentGroup, false); 718 m_scene.DeleteSceneObject(selectedTree.ParentGroup, false);
724 copse.m_trees.Remove(selectedTree.ParentGroup.UUID); 719 copse.m_trees.Remove(selectedTree.ParentGroup.UUID);
720<<<<<<< HEAD:OpenSim/Region/OptionalModules/World/TreePopulator/TreePopulatorModule.cs
725 721
726 m_scene.ForEachClient(delegate(IClientAPI controller) 722 m_scene.ForEachClient(delegate(IClientAPI controller)
727 { 723 {
@@ -729,6 +725,8 @@ namespace OpenSim.Region.OptionalModules.World.TreePopulator
729 new List<uint>() { selectedTree.LocalId }); 725 new List<uint>() { selectedTree.LocalId });
730 }); 726 });
731 727
728=======
729>>>>>>> 146322eb34c15a5722cfe42dd012821ddf441fe6:OpenSim/Region/OptionalModules/World/TreePopulator/TreePopulatorModule.cs
732 break; 730 break;
733 } 731 }
734 } 732 }