diff options
| author | Justin Clark-Casey (justincc) | 2011-10-28 23:16:46 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2011-10-28 23:16:46 +0100 |
| commit | 0fe756e42c23dabf3b754f3675597aaf6fb627c4 (patch) | |
| tree | aa9ebe244f7efe03b8e8cbf80a70b6fb34a6dade /OpenSim/Region/RegionCombinerModule | |
| parent | fetch SOP.RotationOffset once in UpdateRotation() and compare rather than fet... (diff) | |
| parent | Removed use of 'is' operator and casting to find the root ScenePresence in Me... (diff) | |
| download | opensim-SC-0fe756e42c23dabf3b754f3675597aaf6fb627c4.zip opensim-SC-0fe756e42c23dabf3b754f3675597aaf6fb627c4.tar.gz opensim-SC-0fe756e42c23dabf3b754f3675597aaf6fb627c4.tar.bz2 opensim-SC-0fe756e42c23dabf3b754f3675597aaf6fb627c4.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
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) |