ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-05 17:05:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

change the GetFallbackRegions sort code

Browse Source
This commit is contained in:
UbitUmarov
2021-09-02 17:22:59 +01:00
parent 58df13587f
commit 9b840f1f9e
6 changed files with 41 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
OpenSim/Data/Null/NullRegionData.cs
View File

@@ -73,17 +73,12 @@ namespace OpenSim.Data.Null
if (m_useStaticInstance && Instance != this)
return Instance.GetSpecific(regionName, scopeID);
string cleanName = regionName.ToLower();
Matcher queryMatch;
queryMatch = delegate (string s) { return s.Equals(cleanName); };
lock (m_regionData)
lock (m_regionData)
{
foreach (RegionData r in m_regionData.Values)
{
// m_log.DebugFormat("[NULL REGION DATA]: comparing {0} to {1}", cleanName, r.RegionName.ToLower());
if (queryMatch(r.RegionName.ToLower()))
return(r);
if(r.RegionName.Equals(regionName, StringComparison.InvariantCultureIgnoreCase))
return r;
}
}
@@ -268,12 +263,9 @@ namespace OpenSim.Data.Null
return Get((int)RegionFlags.DefaultHGRegion, scopeID);
}
public List<RegionData> GetFallbackRegions(UUID scopeID, int x, int y)
public List<RegionData> GetFallbackRegions(UUID scopeID)
{
List<RegionData> regions = Get((int)RegionFlags.FallbackRegion, scopeID);
RegionDataDistanceCompare distanceComparer = new RegionDataDistanceCompare(x, y);
regions.Sort(distanceComparer);
return regions;
return Get((int)RegionFlags.FallbackRegion, scopeID);
}
public List<RegionData> GetHyperlinks(UUID scopeID)