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

fix bad merges

Browse Source
This commit is contained in:
UbitUmarov
2023-01-09 12:48:35 +00:00
parent 8946cb9f1c
commit e2f59e72c5
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Services/HypergridService/GatekeeperService.cs
View File

@@ -678,9 +678,9 @@ namespace OpenSim.Services.HypergridService
if (!userURL.EndsWith("/"))
userURL += "/";
if (exceptions.Find(delegate(string s)
foreach (string s in exceptions)
{
if(userURL.Equals(s))
if (userURL.Equals(s))
return true;
}
}

7
OpenSim/Services/HypergridService/UserAgentService.cs
View File

@@ -682,8 +682,11 @@ namespace OpenSim.Services.HypergridService
if (!exceptions.TryGetValue(level, out List<string> excep) || excep.Count == 0)
return false;
bool exception = false;
if (exceptions[level].Count > 0) // we have exceptions
string destination = dest;
if (!destination.EndsWith("/"))
destination += "/";
foreach (string s in excep)
{
if (destination.Equals(s))
return true;