diff options
| author | Melanie | 2011-11-02 00:07:59 +0000 |
|---|---|---|
| committer | Melanie | 2011-11-02 00:07:59 +0000 |
| commit | 9a8715ec9a8e8b9c3b4ea10b350f5e1afed6dc15 (patch) | |
| tree | c41e23e27a7510660a2a256ad51a3475bd8348d1 /OpenSim | |
| parent | Merge branch 'master' into bigmerge (diff) | |
| parent | Part 2 of see_into_this_sim_from_neighbor configuration option removal (diff) | |
| download | opensim-SC-9a8715ec9a8e8b9c3b4ea10b350f5e1afed6dc15.zip opensim-SC-9a8715ec9a8e8b9c3b4ea10b350f5e1afed6dc15.tar.gz opensim-SC-9a8715ec9a8e8b9c3b4ea10b350f5e1afed6dc15.tar.bz2 opensim-SC-9a8715ec9a8e8b9c3b4ea10b350f5e1afed6dc15.tar.xz | |
Merge branch 'master' into bigmerge
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneViewer.cs | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneViewer.cs b/OpenSim/Region/Framework/Scenes/SceneViewer.cs index 092b76e..2c3084c 100644 --- a/OpenSim/Region/Framework/Scenes/SceneViewer.cs +++ b/OpenSim/Region/Framework/Scenes/SceneViewer.cs | |||
| @@ -84,18 +84,15 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 84 | { | 84 | { |
| 85 | if (m_pendingObjects == null) | 85 | if (m_pendingObjects == null) |
| 86 | { | 86 | { |
| 87 | if (!m_presence.IsChildAgent) | 87 | m_pendingObjects = new Queue<SceneObjectGroup>(); |
| 88 | { | ||
| 89 | m_pendingObjects = new Queue<SceneObjectGroup>(); | ||
| 90 | 88 | ||
| 91 | lock (m_pendingObjects) | 89 | lock (m_pendingObjects) |
| 90 | { | ||
| 91 | EntityBase[] entities = m_presence.Scene.Entities.GetEntities(); | ||
| 92 | foreach (EntityBase e in entities) | ||
| 92 | { | 93 | { |
| 93 | EntityBase[] entities = m_presence.Scene.Entities.GetEntities(); | 94 | if (e != null && e is SceneObjectGroup) |
| 94 | foreach (EntityBase e in entities) | 95 | m_pendingObjects.Enqueue((SceneObjectGroup)e); |
| 95 | { | ||
| 96 | if (e != null && e is SceneObjectGroup) | ||
| 97 | m_pendingObjects.Enqueue((SceneObjectGroup)e); | ||
| 98 | } | ||
| 99 | } | 96 | } |
| 100 | } | 97 | } |
| 101 | } | 98 | } |