diff options
| author | Justin Clark-Casey (justincc) | 2012-10-29 23:19:06 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2012-10-29 23:19:06 +0000 |
| commit | 5681e812a50b939d4b14dc785a56b649b71d1119 (patch) | |
| tree | 28498f8c102d4013b506dfbce72770affde32cb2 /OpenSim | |
| parent | Add "force gc" region console command which manually invokes garbage collection. (diff) | |
| parent | Deep copy the collection of at_target objects so it can't be modified while (diff) | |
| download | opensim-SC_OLD-5681e812a50b939d4b14dc785a56b649b71d1119.zip opensim-SC_OLD-5681e812a50b939d4b14dc785a56b649b71d1119.tar.gz opensim-SC_OLD-5681e812a50b939d4b14dc785a56b649b71d1119.tar.bz2 opensim-SC_OLD-5681e812a50b939d4b14dc785a56b649b71d1119.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 9c61fe7..2cdc4b3 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
| @@ -1692,9 +1692,12 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1692 | 1692 | ||
| 1693 | private void CheckAtTargets() | 1693 | private void CheckAtTargets() |
| 1694 | { | 1694 | { |
| 1695 | Dictionary<UUID, SceneObjectGroup>.ValueCollection objs; | 1695 | List<SceneObjectGroup> objs = new List<SceneObjectGroup>(); |
| 1696 | lock (m_groupsWithTargets) | 1696 | lock (m_groupsWithTargets) |
| 1697 | objs = m_groupsWithTargets.Values; | 1697 | { |
| 1698 | foreach (SceneObjectGroup grp in m_groupsWithTargets.Values) | ||
| 1699 | objs.Add(grp); | ||
| 1700 | } | ||
| 1698 | 1701 | ||
| 1699 | foreach (SceneObjectGroup entry in objs) | 1702 | foreach (SceneObjectGroup entry in objs) |
| 1700 | entry.checkAtTargets(); | 1703 | entry.checkAtTargets(); |