mirror of
https://github.com/opensim/opensim.git
synced 2026-08-05 17:05:55 +08:00
fix bad merges
This commit is contained in:
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user