diff options
| author | Melanie | 2011-11-01 23:54:09 +0000 |
|---|---|---|
| committer | Melanie | 2011-11-01 23:54:09 +0000 |
| commit | b69f679122fb7fdc0f77fc198e148f42797a2eef (patch) | |
| tree | e06d4f4572a91a58c79c03c60b0fca5574467834 /OpenSim/Region/Framework/Scenes/SceneViewer.cs | |
| parent | Merge branch 'master' into bigmerge (diff) | |
| parent | Removed see_into_this_sim_from_neighbor configuration option. (diff) | |
| download | opensim-SC_OLD-b69f679122fb7fdc0f77fc198e148f42797a2eef.zip opensim-SC_OLD-b69f679122fb7fdc0f77fc198e148f42797a2eef.tar.gz opensim-SC_OLD-b69f679122fb7fdc0f77fc198e148f42797a2eef.tar.bz2 opensim-SC_OLD-b69f679122fb7fdc0f77fc198e148f42797a2eef.tar.xz | |
Merge branch 'master' into bigmerge
Conflicts:
OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneViewer.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneViewer.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneViewer.cs b/OpenSim/Region/Framework/Scenes/SceneViewer.cs index 8a0d288..092b76e 100644 --- a/OpenSim/Region/Framework/Scenes/SceneViewer.cs +++ b/OpenSim/Region/Framework/Scenes/SceneViewer.cs | |||
| @@ -84,7 +84,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 84 | { | 84 | { |
| 85 | if (m_pendingObjects == null) | 85 | if (m_pendingObjects == null) |
| 86 | { | 86 | { |
| 87 | if (!m_presence.IsChildAgent || (m_presence.Scene.m_seeIntoRegionFromNeighbor)) | 87 | if (!m_presence.IsChildAgent) |
| 88 | { | 88 | { |
| 89 | m_pendingObjects = new Queue<SceneObjectGroup>(); | 89 | m_pendingObjects = new Queue<SceneObjectGroup>(); |
| 90 | 90 | ||