aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/Null
diff options
context:
space:
mode:
authorMelanie2010-08-08 18:24:33 +0100
committerMelanie2010-08-08 18:24:33 +0100
commit321e1148da7fd1fa3a2bf0b0460c17c632aaf5b2 (patch)
treefe6321cf65640d1e6c9fd94b65a3cf5981470204 /OpenSim/Data/Null
parentMerge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca... (diff)
parentAdd distance sort for null, too (diff)
downloadopensim-SC-321e1148da7fd1fa3a2bf0b0460c17c632aaf5b2.zip
opensim-SC-321e1148da7fd1fa3a2bf0b0460c17c632aaf5b2.tar.gz
opensim-SC-321e1148da7fd1fa3a2bf0b0460c17c632aaf5b2.tar.bz2
opensim-SC-321e1148da7fd1fa3a2bf0b0460c17c632aaf5b2.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Data/Null')
-rw-r--r--OpenSim/Data/Null/NullRegionData.cs7
1 files changed, 5 insertions, 2 deletions
diff --git a/OpenSim/Data/Null/NullRegionData.cs b/OpenSim/Data/Null/NullRegionData.cs
index f276d10..2065355 100644
--- a/OpenSim/Data/Null/NullRegionData.cs
+++ b/OpenSim/Data/Null/NullRegionData.cs
@@ -169,7 +169,10 @@ namespace OpenSim.Data.Null
169 169
170 public List<RegionData> GetFallbackRegions(UUID scopeID, int x, int y) 170 public List<RegionData> GetFallbackRegions(UUID scopeID, int x, int y)
171 { 171 {
172 return Get((int)RegionFlags.FallbackRegion, scopeID); 172 List<RegionData> regions = Get((int)RegionFlags.FallbackRegion, scopeID);
173 RegionDataDistanceCompare distanceComparer = new RegionDataDistanceCompare(x, y);
174 regions.Sort(distanceComparer);
175 return regions;
173 } 176 }
174 177
175 public List<RegionData> GetHyperlinks(UUID scopeID) 178 public List<RegionData> GetHyperlinks(UUID scopeID)
@@ -193,4 +196,4 @@ namespace OpenSim.Data.Null
193 return ret; 196 return ret;
194 } 197 }
195 } 198 }
196} \ No newline at end of file 199}