From 6ab5ca2bda9966d00470fc9f6967bce4eca663d2 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Tue, 9 Aug 2011 22:11:27 +0200
Subject: Guard another nullref

---
 OpenSim/Region/Framework/Scenes/SceneViewer.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenSim/Region/Framework/Scenes/SceneViewer.cs')

diff --git a/OpenSim/Region/Framework/Scenes/SceneViewer.cs b/OpenSim/Region/Framework/Scenes/SceneViewer.cs
index 1f4ec96..f04ed4d 100644
--- a/OpenSim/Region/Framework/Scenes/SceneViewer.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneViewer.cs
@@ -106,7 +106,7 @@ namespace OpenSim.Region.Framework.Scenes
                         g.ScheduleFullUpdateToAvatar(m_presence);
                 }
 
-                while (m_partsUpdateQueue.Count != null && m_partsUpdateQueue.Count > 0)
+                while (m_partsUpdateQueue != null && m_partsUpdateQueue.Count != null && m_partsUpdateQueue.Count > 0)
                 {
                     SceneObjectPart part = m_partsUpdateQueue.Dequeue();
                     
-- 
cgit v1.1