diff options
| author | Melanie | 2012-03-11 02:29:43 +0000 |
|---|---|---|
| committer | Melanie | 2012-03-11 02:29:43 +0000 |
| commit | f292e19689f9b01a5706e765543064b6ad61caa9 (patch) | |
| tree | 0752aaa6a4ddc23c2f3a9296f02143cea3b6e6e1 /OpenSim/Region/RegionCombinerModule | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC_OLD-f292e19689f9b01a5706e765543064b6ad61caa9.zip opensim-SC_OLD-f292e19689f9b01a5706e765543064b6ad61caa9.tar.gz opensim-SC_OLD-f292e19689f9b01a5706e765543064b6ad61caa9.tar.bz2 opensim-SC_OLD-f292e19689f9b01a5706e765543064b6ad61caa9.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Application/OpenSimBase.cs
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) |