aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/RegionCombinerModule
diff options
context:
space:
mode:
authorMelanie2010-06-09 16:48:37 +0100
committerMelanie2010-06-09 16:48:37 +0100
commit6b2d2413f7026c41e7abb55c72c583670cb6011d (patch)
tree6596f0132d36f74f2e57c9b1bd891d95eb0e5a33 /OpenSim/Region/RegionCombinerModule
parentMerge branch 'master' into careminster-presence-refactor (diff)
parentAdd the BEGIN; I had missed (diff)
downloadopensim-SC_OLD-6b2d2413f7026c41e7abb55c72c583670cb6011d.zip
opensim-SC_OLD-6b2d2413f7026c41e7abb55c72c583670cb6011d.tar.gz
opensim-SC_OLD-6b2d2413f7026c41e7abb55c72c583670cb6011d.tar.bz2
opensim-SC_OLD-6b2d2413f7026c41e7abb55c72c583670cb6011d.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/RegionCombinerModule')
-rw-r--r--OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs4
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs b/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs
index b42d3bf..d854176 100644
--- a/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs
+++ b/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs
@@ -614,7 +614,9 @@ namespace OpenSim.Region.RegionCombinerModule
614 presence.SetSendCourseLocationMethod(SendCourseLocationUpdates); 614 presence.SetSendCourseLocationMethod(SendCourseLocationUpdates);
615 } 615 }
616 616
617 private void SendCourseLocationUpdates(UUID sceneId, ScenePresence presence) 617 // This delegate was refactored for non-combined regions.
618 // This combined region version will not use the pre-compiled lists of locations and ids
619 private void SendCourseLocationUpdates(UUID sceneId, ScenePresence presence, List<Vector3> coarseLocations, List<UUID> avatarUUIDs)
618 { 620 {
619 RegionConnections connectiondata = null; 621 RegionConnections connectiondata = null;
620 lock (m_regions) 622 lock (m_regions)