aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs
diff options
context:
space:
mode:
authorDiva Canto2012-03-10 08:09:43 -0800
committerDiva Canto2012-03-10 08:09:43 -0800
commit291dc3969181f4718e84f33e18c4bf9d519cde3d (patch)
treec22f305a20f32b0a390681ca73eab8cc0bf213b0 /OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs
parentSerialize all web requests to a particular host:port pair; only applied to th... (diff)
parentFix TestSaveOarNoAssets() by not launch a no-assets request on a separate thr... (diff)
downloadopensim-SC-291dc3969181f4718e84f33e18c4bf9d519cde3d.zip
opensim-SC-291dc3969181f4718e84f33e18c4bf9d519cde3d.tar.gz
opensim-SC-291dc3969181f4718e84f33e18c4bf9d519cde3d.tar.bz2
opensim-SC-291dc3969181f4718e84f33e18c4bf9d519cde3d.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs')
-rw-r--r--OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs b/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs
index eb633b3..a142f26 100644
--- a/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs
+++ b/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs
@@ -712,7 +712,7 @@ namespace OpenSim.Region.RegionCombinerModule
712 712
713 List<Vector3> CoarseLocations = new List<Vector3>(); 713 List<Vector3> CoarseLocations = new List<Vector3>();
714 List<UUID> AvatarUUIDs = new List<UUID>(); 714 List<UUID> AvatarUUIDs = new List<UUID>();
715 715
716 connectiondata.RegionScene.ForEachRootScenePresence(delegate(ScenePresence sp) 716 connectiondata.RegionScene.ForEachRootScenePresence(delegate(ScenePresence sp)
717 { 717 {
718 if (sp.UUID != presence.UUID) 718 if (sp.UUID != presence.UUID)