Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim

This commit is contained in:
Melanie
2012-10-30 23:14:06 +00:00
3 changed files with 21 additions and 7 deletions

View File

@@ -1692,15 +1692,19 @@ namespace OpenSim.Region.Framework.Scenes
private void CheckAtTargets()
{
List<SceneObjectGroup> objs = new List<SceneObjectGroup>();
List<SceneObjectGroup> objs = null;
lock (m_groupsWithTargets)
{
foreach (SceneObjectGroup grp in m_groupsWithTargets.Values)
objs.Add(grp);
if (m_groupsWithTargets.Count != 0)
objs = new List<SceneObjectGroup>(m_groupsWithTargets.Values);
}
foreach (SceneObjectGroup entry in objs)
entry.checkAtTargets();
if (objs != null)
{
foreach (SceneObjectGroup entry in objs)
entry.checkAtTargets();
}
}
/// <summary>