diff options
| author | Dr Scofield | 2009-03-10 15:54:00 +0000 |
|---|---|---|
| committer | Dr Scofield | 2009-03-10 15:54:00 +0000 |
| commit | fd9ba29a03150297c99653d25e4d6c015a0fe7d9 (patch) | |
| tree | aa4547ab328c5e53c1302fd24e838421c776d91f /OpenSim/Region/Framework/Scenes | |
| parent | fixing out-of-sync error in BaseHttpServer (diff) | |
| download | opensim-SC_OLD-fd9ba29a03150297c99653d25e4d6c015a0fe7d9.zip opensim-SC_OLD-fd9ba29a03150297c99653d25e4d6c015a0fe7d9.tar.gz opensim-SC_OLD-fd9ba29a03150297c99653d25e4d6c015a0fe7d9.tar.bz2 opensim-SC_OLD-fd9ba29a03150297c99653d25e4d6c015a0fe7d9.tar.xz | |
From: Alan M Webb <alan_webb@us.ibm.com>
Fix a null reference loophole in ScenePresence.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 5831ff4..3ef3f6c 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
| @@ -718,7 +718,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 718 | } | 718 | } |
| 719 | } | 719 | } |
| 720 | 720 | ||
| 721 | while (m_pendingObjects.Count > 0 && m_partsUpdateQueue.Count < 60) | 721 | while (m_pendingObjects != null && m_pendingObjects.Count > 0 && m_partsUpdateQueue.Count < 60) |
| 722 | { | 722 | { |
| 723 | SceneObjectGroup g = m_pendingObjects.Dequeue(); | 723 | SceneObjectGroup g = m_pendingObjects.Dequeue(); |
| 724 | 724 | ||