diff options
| author | Melanie | 2012-10-28 18:43:28 +0000 |
|---|---|---|
| committer | Melanie | 2012-10-28 18:43:28 +0000 |
| commit | 502efdb894dce21e6b5ad7b45222765af6510d92 (patch) | |
| tree | 0d4ad5ec40a862c301538196fe89fbf8883dc04e /OpenSim/Region/Framework | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Deep copy the collection of at_target objects so it can't be modified while (diff) | |
| download | opensim-SC_OLD-502efdb894dce21e6b5ad7b45222765af6510d92.zip opensim-SC_OLD-502efdb894dce21e6b5ad7b45222765af6510d92.tar.gz opensim-SC_OLD-502efdb894dce21e6b5ad7b45222765af6510d92.tar.bz2 opensim-SC_OLD-502efdb894dce21e6b5ad7b45222765af6510d92.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to 'OpenSim/Region/Framework')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 218d4e4..9f87e1e 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
| @@ -1750,7 +1750,10 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1750 | { | 1750 | { |
| 1751 | List<SceneObjectGroup> objs = new List<SceneObjectGroup>(); | 1751 | List<SceneObjectGroup> objs = new List<SceneObjectGroup>(); |
| 1752 | lock (m_groupsWithTargets) | 1752 | lock (m_groupsWithTargets) |
| 1753 | objs = new List<SceneObjectGroup>(m_groupsWithTargets.Values); | 1753 | { |
| 1754 | foreach (SceneObjectGroup grp in m_groupsWithTargets.Values) | ||
| 1755 | objs.Add(grp); | ||
| 1756 | } | ||
| 1754 | 1757 | ||
| 1755 | foreach (SceneObjectGroup entry in objs) | 1758 | foreach (SceneObjectGroup entry in objs) |
| 1756 | entry.checkAtTargets(); | 1759 | entry.checkAtTargets(); |