diff options
| author | sacha | 2010-12-23 08:14:43 +0000 |
|---|---|---|
| committer | sacha | 2010-12-23 08:14:43 +0000 |
| commit | 98f0b4c72ad208e9f664d30bb6a84e0b2adf8214 (patch) | |
| tree | fdf6001af7f458fed5bf6f18df9be1882eb193d4 /OpenSim/Region/Framework/Scenes/SceneViewer.cs | |
| parent | reactivating some traces to track a dead thread (diff) | |
| parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
| download | opensim-SC-98f0b4c72ad208e9f664d30bb6a84e0b2adf8214.zip opensim-SC-98f0b4c72ad208e9f664d30bb6a84e0b2adf8214.tar.gz opensim-SC-98f0b4c72ad208e9f664d30bb6a84e0b2adf8214.tar.bz2 opensim-SC-98f0b4c72ad208e9f664d30bb6a84e0b2adf8214.tar.xz | |
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneViewer.cs')
| -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 | ||