aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMelanie2011-08-09 22:11:27 +0200
committerMelanie2011-08-09 22:11:27 +0200
commit6ab5ca2bda9966d00470fc9f6967bce4eca663d2 (patch)
tree080aca28ca588c398bb6fa9c00f2be39d48425ec /OpenSim
parentGuard against a bad login leaving us with a null queue (diff)
downloadopensim-SC_OLD-6ab5ca2bda9966d00470fc9f6967bce4eca663d2.zip
opensim-SC_OLD-6ab5ca2bda9966d00470fc9f6967bce4eca663d2.tar.gz
opensim-SC_OLD-6ab5ca2bda9966d00470fc9f6967bce4eca663d2.tar.bz2
opensim-SC_OLD-6ab5ca2bda9966d00470fc9f6967bce4eca663d2.tar.xz
Guard another nullref
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneViewer.cs2
1 files changed, 1 insertions, 1 deletions
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
106 g.ScheduleFullUpdateToAvatar(m_presence); 106 g.ScheduleFullUpdateToAvatar(m_presence);
107 } 107 }
108 108
109 while (m_partsUpdateQueue.Count != null && m_partsUpdateQueue.Count > 0) 109 while (m_partsUpdateQueue != null && m_partsUpdateQueue.Count != null && m_partsUpdateQueue.Count > 0)
110 { 110 {
111 SceneObjectPart part = m_partsUpdateQueue.Dequeue(); 111 SceneObjectPart part = m_partsUpdateQueue.Dequeue();
112 112