Merge branch 'master' into careminster-presence-refactor

This commit is contained in:
Melanie
2010-08-08 18:24:33 +01:00
7 changed files with 112 additions and 11 deletions

View File

@@ -169,7 +169,10 @@ namespace OpenSim.Data.Null
public List<RegionData> GetFallbackRegions(UUID scopeID, int x, int y)
{
return Get((int)RegionFlags.FallbackRegion, scopeID);
List<RegionData> regions = Get((int)RegionFlags.FallbackRegion, scopeID);
RegionDataDistanceCompare distanceComparer = new RegionDataDistanceCompare(x, y);
regions.Sort(distanceComparer);
return regions;
}
public List<RegionData> GetHyperlinks(UUID scopeID)
@@ -193,4 +196,4 @@ namespace OpenSim.Data.Null
return ret;
}
}
}
}