aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorDan Lake2011-10-04 16:59:05 -0700
committerDan Lake2011-10-04 16:59:05 -0700
commit146322eb34c15a5722cfe42dd012821ddf441fe6 (patch)
tree0953225cedcc40e4e5362db9d381df4b1e7111b1 /OpenSim/Region
parentRemoved all refs to IClientAPI from IAttachmentsModule. Separated client hand... (diff)
downloadopensim-SC_OLD-146322eb34c15a5722cfe42dd012821ddf441fe6.zip
opensim-SC_OLD-146322eb34c15a5722cfe42dd012821ddf441fe6.tar.gz
opensim-SC_OLD-146322eb34c15a5722cfe42dd012821ddf441fe6.tar.bz2
opensim-SC_OLD-146322eb34c15a5722cfe42dd012821ddf441fe6.tar.xz
Removed redundant IClientAPI calls from TreePopulatorModule. Removing tree objects already triggers objectkill packet to client. No need to send again.
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/OptionalModules/World/TreePopulator/TreePopulatorModule.cs16
1 files changed, 2 insertions, 14 deletions
diff --git a/OpenSim/Region/OptionalModules/World/TreePopulator/TreePopulatorModule.cs b/OpenSim/Region/OptionalModules/World/TreePopulator/TreePopulatorModule.cs
index feca7d3..a17eb41 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 selectedTree.LocalId);
389 });
390 } 385 }
391 else 386 else
392 { 387 {
@@ -719,16 +714,9 @@ 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);
725
726 m_scene.ForEachClient(delegate(IClientAPI controller)
727 {
728 controller.SendKillObject(m_scene.RegionInfo.RegionHandle,
729 selectedTree.LocalId);
730 });
731
732 break; 720 break;
733 } 721 }
734 } 722 }