Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim

1 files changed, 3 insertions, 1 deletions

diff --git a/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs b/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs
index 9cb349a..ff0e743 100644
--- a/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs
+++ b/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs
@@ -696,7 +696,9 @@ namespace OpenSim.Region.RegionCombinerModule
             presence.SetSendCourseLocationMethod(SendCourseLocationUpdates);
         }
 
-        private void SendCourseLocationUpdates(UUID sceneId, ScenePresence presence)
+        // This delegate was refactored for non-combined regions.
+        // This combined region version will not use the pre-compiled lists of locations and ids
+        private void SendCourseLocationUpdates(UUID sceneId, ScenePresence presence, List<Vector3> coarseLocations, List<UUID> avatarUUIDs)
         {
             RegionConnections connectiondata = null; 
             lock (m_regions)