diff options
| author | Melanie | 2010-12-22 03:25:30 +0100 |
|---|---|---|
| committer | Melanie | 2010-12-22 03:25:30 +0100 |
| commit | cf37b3b9434ca940fa635c0e951fa9ac7c07175a (patch) | |
| tree | 0a8a04c233d6b7f8a785b0c9523d36ae5abcda36 /OpenSim/Region/Framework/Scenes/SceneViewer.cs | |
| parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
| download | opensim-SC_OLD-cf37b3b9434ca940fa635c0e951fa9ac7c07175a.zip opensim-SC_OLD-cf37b3b9434ca940fa635c0e951fa9ac7c07175a.tar.gz opensim-SC_OLD-cf37b3b9434ca940fa635c0e951fa9ac7c07175a.tar.bz2 opensim-SC_OLD-cf37b3b9434ca940fa635c0e951fa9ac7c07175a.tar.xz | |
Prevent a null ref when an avatar login doesn't go as planned
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneViewer.cs | 2 |
1 files changed, 1 insertions, 1 deletions
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 | |||
| 106 | g.ScheduleFullUpdateToAvatar(m_presence); | 106 | g.ScheduleFullUpdateToAvatar(m_presence); |
| 107 | } | 107 | } |
| 108 | 108 | ||
| 109 | while (m_partsUpdateQueue.Count > 0) | 109 | while (m_partsUpdateQueue.Count != null && m_partsUpdateQueue.Count > 0) |
| 110 | { | 110 | { |
| 111 | SceneObjectPart part = m_partsUpdateQueue.Dequeue(); | 111 | SceneObjectPart part = m_partsUpdateQueue.Dequeue(); |
| 112 | 112 | ||