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

Merge branch 'master' into careminster 

Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
avinationmerge
Melanie 2012-10-28 18:43:28 +00:00
parent 42cd27c46a 5a96ef52cb
commit 502efdb894
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
OpenSim/Region/Framework/Scenes/Scene.cs
View File

@ -1750,7 +1750,10 @@ namespace OpenSim.Region.Framework.Scenes
{ {
List<SceneObjectGroup> objs = new List<SceneObjectGroup>(); List<SceneObjectGroup> objs = new List<SceneObjectGroup>();
lock (m_groupsWithTargets) lock (m_groupsWithTargets)
objs = new List<SceneObjectGroup>(m_groupsWithTargets.Values); {
foreach (SceneObjectGroup grp in m_groupsWithTargets.Values)
objs.Add(grp);
}
foreach (SceneObjectGroup entry in objs) foreach (SceneObjectGroup entry in objs)
entry.checkAtTargets(); entry.checkAtTargets();