diff options
| author | Melanie Thielker | 2010-05-27 20:08:48 +0200 |
|---|---|---|
| committer | Melanie | 2010-05-27 19:09:06 +0100 |
| commit | 8fb706716ba0162210d6030f3e7b5b6636b35651 (patch) | |
| tree | 72859c98b67dc2b10f5fa0e6ca09040029d442cf | |
| parent | Comment noisy "CONNECTION DEBUGGING" messages, because they push more (diff) | |
| download | opensim-SC_OLD-8fb706716ba0162210d6030f3e7b5b6636b35651.zip opensim-SC_OLD-8fb706716ba0162210d6030f3e7b5b6636b35651.tar.gz opensim-SC_OLD-8fb706716ba0162210d6030f3e7b5b6636b35651.tar.bz2 opensim-SC_OLD-8fb706716ba0162210d6030f3e7b5b6636b35651.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 c6cf4cc..15bc33d 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 |