aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorMelanie2010-10-08 18:40:13 +0100
committerMelanie2010-10-08 18:40:13 +0100
commit5dcbbb726a15bc14da76b59577d009c25ad5e4e1 (patch)
tree03b8689e11e0a5fcf349a33d1b4eaa9dfdee0549 /OpenSim/Region/Framework
parentMerge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff)
downloadopensim-SC_OLD-5dcbbb726a15bc14da76b59577d009c25ad5e4e1.zip
opensim-SC_OLD-5dcbbb726a15bc14da76b59577d009c25ad5e4e1.tar.gz
opensim-SC_OLD-5dcbbb726a15bc14da76b59577d009c25ad5e4e1.tar.bz2
opensim-SC_OLD-5dcbbb726a15bc14da76b59577d009c25ad5e4e1.tar.xz
Change the order of actions to address a possible nullref
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneViewer.cs5
1 files changed, 2 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneViewer.cs b/OpenSim/Region/Framework/Scenes/SceneViewer.cs
index b45291f..e6f7235 100644
--- a/OpenSim/Region/Framework/Scenes/SceneViewer.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneViewer.cs
@@ -179,11 +179,10 @@ namespace OpenSim.Region.Framework.Scenes
179 179
180 public void Reset() 180 public void Reset()
181 { 181 {
182 if (m_pendingObjects != null) 182 lock (m_pendingObjects)
183 { 183 {
184 lock (m_pendingObjects) 184 if (m_pendingObjects != null)
185 { 185 {
186
187 m_pendingObjects.Clear(); 186 m_pendingObjects.Clear();
188 m_pendingObjects = null; 187 m_pendingObjects = null;
189 } 188 }