diff options
| author | Mike Rieker | 2010-05-27 21:31:10 -0400 |
|---|---|---|
| committer | Mike Rieker | 2010-05-27 21:31:10 -0400 |
| commit | 9ea42fdfab2ac99e24b386d67a08cf0024230f54 (patch) | |
| tree | fdefa445346d03ad2d73b62687ffae4e3b635ba9 /OpenSim/Region/Framework/Scenes/SceneViewer.cs | |
| parent | fix hanging output throttle arithmetic (diff) | |
| parent | Prevent a null ref (diff) | |
| download | opensim-SC-9ea42fdfab2ac99e24b386d67a08cf0024230f54.zip opensim-SC-9ea42fdfab2ac99e24b386d67a08cf0024230f54.tar.gz opensim-SC-9ea42fdfab2ac99e24b386d67a08cf0024230f54.tar.bz2 opensim-SC-9ea42fdfab2ac99e24b386d67a08cf0024230f54.tar.xz | |
Merge branch 'careminster-presence-refactor' of www.3dhosting.de:/var/git/careminster into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneViewer.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneViewer.cs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneViewer.cs b/OpenSim/Region/Framework/Scenes/SceneViewer.cs index 4ba4fab..2fc98e5 100644 --- a/OpenSim/Region/Framework/Scenes/SceneViewer.cs +++ b/OpenSim/Region/Framework/Scenes/SceneViewer.cs | |||
| @@ -84,6 +84,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 84 | while (m_pendingObjects != null && m_pendingObjects.Count > 0) | 84 | while (m_pendingObjects != null && m_pendingObjects.Count > 0) |
| 85 | { | 85 | { |
| 86 | SceneObjectGroup g = m_pendingObjects.Dequeue(); | 86 | SceneObjectGroup g = m_pendingObjects.Dequeue(); |
| 87 | // Yes, this can really happen | ||
| 88 | if (g == null) | ||
| 89 | continue; | ||
| 87 | 90 | ||
| 88 | // This is where we should check for draw distance | 91 | // This is where we should check for draw distance |
| 89 | // do culling and stuff. Problem with that is that until | 92 | // do culling and stuff. Problem with that is that until |