aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/RegionCombinerModule
diff options
context:
space:
mode:
authorMelanie2010-06-09 03:52:24 +0100
committerMelanie2010-06-09 03:52:24 +0100
commit796e9b5cb48f1077f5c6ef85a6b2b0bfe3b907e7 (patch)
tree068bd7280922296c764cccfe05e12dcaadc7bd45 /OpenSim/Region/RegionCombinerModule
parentIf a script is deleted before it gets compiled, don't even bother to try (diff)
parentRefactor SendCoarseLocations for better performance. Instead of computing lis... (diff)
downloadopensim-SC_OLD-796e9b5cb48f1077f5c6ef85a6b2b0bfe3b907e7.zip
opensim-SC_OLD-796e9b5cb48f1077f5c6ef85a6b2b0bfe3b907e7.tar.gz
opensim-SC_OLD-796e9b5cb48f1077f5c6ef85a6b2b0bfe3b907e7.tar.bz2
opensim-SC_OLD-796e9b5cb48f1077f5c6ef85a6b2b0bfe3b907e7.tar.xz
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
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 9cb349a..ff0e743 100644
--- a/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs
+++ b/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs
@@ -696,7 +696,9 @@ namespace OpenSim.Region.RegionCombinerModule
696 presence.SetSendCourseLocationMethod(SendCourseLocationUpdates); 696 presence.SetSendCourseLocationMethod(SendCourseLocationUpdates);
697 } 697 }
698 698
699 private void SendCourseLocationUpdates(UUID sceneId, ScenePresence presence) 699 // This delegate was refactored for non-combined regions.
700 // This combined region version will not use the pre-compiled lists of locations and ids
701 private void SendCourseLocationUpdates(UUID sceneId, ScenePresence presence, List<Vector3> coarseLocations, List<UUID> avatarUUIDs)
700 { 702 {
701 RegionConnections connectiondata = null; 703 RegionConnections connectiondata = null;
702 lock (m_regions) 704 lock (m_regions)