aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMW2009-06-26 12:30:54 +0000
committerMW2009-06-26 12:30:54 +0000
commit9e4d077d70f2fce2c03e81ab01c2b6369734bd69 (patch)
tree375932cc6a7a918eb10565bfad1f34164e755d51 /OpenSim
parentExtracted the code that handles the sending of prim updates to the client, fr... (diff)
downloadopensim-SC_OLD-9e4d077d70f2fce2c03e81ab01c2b6369734bd69.zip
opensim-SC_OLD-9e4d077d70f2fce2c03e81ab01c2b6369734bd69.tar.gz
opensim-SC_OLD-9e4d077d70f2fce2c03e81ab01c2b6369734bd69.tar.bz2
opensim-SC_OLD-9e4d077d70f2fce2c03e81ab01c2b6369734bd69.tar.xz
Fixed null bug, which was making unit tests fail
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneViewer.cs10
1 files changed, 7 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneViewer.cs b/OpenSim/Region/Framework/Scenes/SceneViewer.cs
index 4e542b8..42966b1 100644
--- a/OpenSim/Region/Framework/Scenes/SceneViewer.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneViewer.cs
@@ -189,10 +189,14 @@ namespace OpenSim.Region.Framework.Scenes
189 189
190 public void Reset() 190 public void Reset()
191 { 191 {
192 lock (m_pendingObjects) 192 if (m_pendingObjects != null)
193 { 193 {
194 m_pendingObjects.Clear(); 194 lock (m_pendingObjects)
195 m_pendingObjects = null; 195 {
196
197 m_pendingObjects.Clear();
198 m_pendingObjects = null;
199 }
196 } 200 }
197 } 201 }
198 202