diff options
| author | Melanie Thielker | 2010-05-27 20:08:48 +0200 |
|---|---|---|
| committer | Melanie Thielker | 2010-05-27 20:08:48 +0200 |
| commit | ba49319c077bc5e7b998674aaac62497e757706c (patch) | |
| tree | 65fdbf6ee8e99fa0292d796de9524011f6818445 | |
| parent | Comment noisy "CONNECTION DEBUGGING" messages, because they push more (diff) | |
| download | opensim-SC-ba49319c077bc5e7b998674aaac62497e757706c.zip opensim-SC-ba49319c077bc5e7b998674aaac62497e757706c.tar.gz opensim-SC-ba49319c077bc5e7b998674aaac62497e757706c.tar.bz2 opensim-SC-ba49319c077bc5e7b998674aaac62497e757706c.tar.xz | |
Prevent a null ref
| -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 |