OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mantis 8563: do not modify collection inside a loop on it a foreach on it

0.9.1.0-post-fixes
UbitUmarov 2019-07-15 22:10:47 +01:00
parent aedaa32ddc
commit 78359c108d
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
View File

@ -14192,15 +14192,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
{ {
m_host.AddScriptLPS(1); m_host.AddScriptLPS(1);
LandData land = World.LandChannel.GetLandObject(m_host.AbsolutePosition).LandData; LandData land = World.LandChannel.GetLandObject(m_host.AbsolutePosition).LandData;
if (land.OwnerID == m_host.OwnerID) if (land.OwnerID == m_host.OwnerID && land.ParcelAccessList.Count > 0)
{ {
var todelete = new List<LandAccessEntry>();
foreach (LandAccessEntry entry in land.ParcelAccessList) foreach (LandAccessEntry entry in land.ParcelAccessList)
{ {
if (entry.Flags == AccessList.Ban) if (entry.Flags == AccessList.Ban)
{ todelete.Add(entry);
land.ParcelAccessList.Remove(entry);
}
} }
foreach (LandAccessEntry entry in todelete)
land.ParcelAccessList.Remove(entry);
} }
ScriptSleep(m_sleepMsOnResetLandBanList); ScriptSleep(m_sleepMsOnResetLandBanList);
} }
@ -14209,15 +14210,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
{ {
m_host.AddScriptLPS(1); m_host.AddScriptLPS(1);
LandData land = World.LandChannel.GetLandObject(m_host.AbsolutePosition).LandData; LandData land = World.LandChannel.GetLandObject(m_host.AbsolutePosition).LandData;
if (land.OwnerID == m_host.OwnerID) if (land.OwnerID == m_host.OwnerID && land.ParcelAccessList.Count > 0)
{ {
var todelete = new List<LandAccessEntry>();
foreach (LandAccessEntry entry in land.ParcelAccessList) foreach (LandAccessEntry entry in land.ParcelAccessList)
{ {
if (entry.Flags == AccessList.Access) if (entry.Flags == AccessList.Access)
{ todelete.Add(entry);
land.ParcelAccessList.Remove(entry);
}
} }
foreach (LandAccessEntry entry in todelete)
land.ParcelAccessList.Remove(entry);
} }
ScriptSleep(m_sleepMsOnResetLandPassList); ScriptSleep(m_sleepMsOnResetLandPassList);
} }