diff options
| author | UbitUmarov | 2012-03-11 03:57:59 +0000 |
|---|---|---|
| committer | UbitUmarov | 2012-03-11 03:57:59 +0000 |
| commit | b0f01cec98c8ac97cee27f16c5f38c06f5a068b3 (patch) | |
| tree | 27fe2b38ce192938a72a1d036dc7d96d55b3478e /OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs | |
| parent | cleanup + comments (diff) | |
| parent | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster (diff) | |
| download | opensim-SC_OLD-b0f01cec98c8ac97cee27f16c5f38c06f5a068b3.zip opensim-SC_OLD-b0f01cec98c8ac97cee27f16c5f38c06f5a068b3.tar.gz opensim-SC_OLD-b0f01cec98c8ac97cee27f16c5f38c06f5a068b3.tar.bz2 opensim-SC_OLD-b0f01cec98c8ac97cee27f16c5f38c06f5a068b3.tar.xz | |
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork
Diffstat (limited to 'OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs')
| -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) |