diff options
| author | John Hurliman | 2010-09-10 12:04:12 -0700 |
|---|---|---|
| committer | John Hurliman | 2010-09-10 12:04:12 -0700 |
| commit | dd277a0d02f1aa79f4fcb5d108cbc696e90500c2 (patch) | |
| tree | 7e396d347e43504ec23c59c3749f995f15c2e254 /OpenSim/Region/Framework/Scenes/SceneViewer.cs | |
| parent | * Run SimianGrid session updates asynchronously instead of from the main hear... (diff) | |
| download | opensim-SC_OLD-dd277a0d02f1aa79f4fcb5d108cbc696e90500c2.zip opensim-SC_OLD-dd277a0d02f1aa79f4fcb5d108cbc696e90500c2.tar.gz opensim-SC_OLD-dd277a0d02f1aa79f4fcb5d108cbc696e90500c2.tar.bz2 opensim-SC_OLD-dd277a0d02f1aa79f4fcb5d108cbc696e90500c2.tar.xz | |
First pass at cleaning up thread safety in EntityManager and SceneGraph
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneViewer.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneViewer.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneViewer.cs b/OpenSim/Region/Framework/Scenes/SceneViewer.cs index f478a4a..7aa5a93 100644 --- a/OpenSim/Region/Framework/Scenes/SceneViewer.cs +++ b/OpenSim/Region/Framework/Scenes/SceneViewer.cs | |||
| @@ -75,7 +75,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 75 | 75 | ||
| 76 | lock(m_pendingObjects) | 76 | lock(m_pendingObjects) |
| 77 | { | 77 | { |
| 78 | foreach (EntityBase e in m_presence.Scene.Entities) | 78 | EntityBase[] entities = m_presence.Scene.Entities.GetEntities(); |
| 79 | foreach (EntityBase e in entities) | ||
| 79 | { | 80 | { |
| 80 | if (e != null && e is SceneObjectGroup) | 81 | if (e != null && e is SceneObjectGroup) |
| 81 | m_pendingObjects.Enqueue((SceneObjectGroup)e); | 82 | m_pendingObjects.Enqueue((SceneObjectGroup)e); |