diff options
| author | Melanie | 2012-03-11 01:55:36 +0100 |
|---|---|---|
| committer | Melanie | 2012-03-11 01:55:36 +0100 |
| commit | 4f7ec1d691d769b9486c841c008e10aef164998f (patch) | |
| tree | 443bd31819ac133d9878c0d906d250cad52e3831 /OpenSim/Region/RegionCombinerModule | |
| parent | Merge branch 'ubitwork' (diff) | |
| parent | Merge branch 'master' into careminster (diff) | |
| download | opensim-SC-4f7ec1d691d769b9486c841c008e10aef164998f.zip opensim-SC-4f7ec1d691d769b9486c841c008e10aef164998f.tar.gz opensim-SC-4f7ec1d691d769b9486c841c008e10aef164998f.tar.bz2 opensim-SC-4f7ec1d691d769b9486c841c008e10aef164998f.tar.xz | |
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
Diffstat (limited to 'OpenSim/Region/RegionCombinerModule')
| -rw-r--r-- | OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs b/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs index 9d52a8f..d8d9554 100644 --- a/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs +++ b/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs | |||
| @@ -630,7 +630,7 @@ namespace OpenSim.Region.RegionCombinerModule | |||
| 630 | 630 | ||
| 631 | List<Vector3> CoarseLocations = new List<Vector3>(); | 631 | List<Vector3> CoarseLocations = new List<Vector3>(); |
| 632 | List<UUID> AvatarUUIDs = new List<UUID>(); | 632 | List<UUID> AvatarUUIDs = new List<UUID>(); |
| 633 | 633 | ||
| 634 | connectiondata.RegionScene.ForEachRootScenePresence(delegate(ScenePresence sp) | 634 | connectiondata.RegionScene.ForEachRootScenePresence(delegate(ScenePresence sp) |
| 635 | { | 635 | { |
| 636 | if (sp.UUID != presence.UUID) | 636 | if (sp.UUID != presence.UUID) |