diff options
author | Dan Lake | 2011-10-27 00:42:21 -0700 |
---|---|---|
committer | Dan Lake | 2011-10-27 00:42:21 -0700 |
commit | b98613091cd6dc2f914fb5ab38ca33cdff21fc24 (patch) | |
tree | 42be01a68146870ddcd64e842a13f2fbb46b4738 /OpenSim/Region/RegionCombinerModule | |
parent | For now, comment out error message on new script engine console commands. (diff) | |
download | opensim-SC-b98613091cd6dc2f914fb5ab38ca33cdff21fc24.zip opensim-SC-b98613091cd6dc2f914fb5ab38ca33cdff21fc24.tar.gz opensim-SC-b98613091cd6dc2f914fb5ab38ca33cdff21fc24.tar.bz2 opensim-SC-b98613091cd6dc2f914fb5ab38ca33cdff21fc24.tar.xz |
Added new ForEachRootScenePresence to Scene since almost every delegate passed to ForEachScenePresence checks for !IsChildAgent first. It consolidates child and root handling for coming refactors.
Diffstat (limited to 'OpenSim/Region/RegionCombinerModule')
-rw-r--r-- | OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs b/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs index 4a24c7d..92cbbc6 100644 --- a/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs +++ b/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs | |||
@@ -711,10 +711,8 @@ namespace OpenSim.Region.RegionCombinerModule | |||
711 | 711 | ||
712 | List<Vector3> CoarseLocations = new List<Vector3>(); | 712 | List<Vector3> CoarseLocations = new List<Vector3>(); |
713 | List<UUID> AvatarUUIDs = new List<UUID>(); | 713 | List<UUID> AvatarUUIDs = new List<UUID>(); |
714 | connectiondata.RegionScene.ForEachScenePresence(delegate(ScenePresence sp) | 714 | connectiondata.RegionScene.ForEachRootScenePresence(delegate(ScenePresence sp) |
715 | { | 715 | { |
716 | if (sp.IsChildAgent) | ||
717 | return; | ||
718 | if (sp.UUID != presence.UUID) | 716 | if (sp.UUID != presence.UUID) |
719 | { | 717 | { |
720 | if (sp.ParentID != 0) | 718 | if (sp.ParentID != 0) |