From cf37b3b9434ca940fa635c0e951fa9ac7c07175a Mon Sep 17 00:00:00 2001
From: Melanie
Date: Wed, 22 Dec 2010 03:25:30 +0100
Subject: Prevent a null ref when an avatar login doesn't go as planned

---
 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 b44a010..40a73a9 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 > 0)
+                while (m_partsUpdateQueue.Count != null && m_partsUpdateQueue.Count > 0)
                 {
                     SceneObjectPart part = m_partsUpdateQueue.Dequeue();
                     
-- 
cgit v1.1