aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorMelanie2010-10-08 19:19:07 +0100
committerMelanie2010-10-08 19:19:07 +0100
commit4a0911bdbd3429d88b448bd324d8813cf6023e64 (patch)
tree5c5cfc71a0f8074baec4edbc784b273285ab3eb1 /OpenSim/Region
parentChange the order of actions to address a possible nullref (diff)
downloadopensim-SC_OLD-4a0911bdbd3429d88b448bd324d8813cf6023e64.zip
opensim-SC_OLD-4a0911bdbd3429d88b448bd324d8813cf6023e64.tar.gz
opensim-SC_OLD-4a0911bdbd3429d88b448bd324d8813cf6023e64.tar.bz2
opensim-SC_OLD-4a0911bdbd3429d88b448bd324d8813cf6023e64.tar.xz
Guard against locking a nullref to avoid build break
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneViewer.cs3
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneViewer.cs b/OpenSim/Region/Framework/Scenes/SceneViewer.cs
index e6f7235..b44a010 100644
--- a/OpenSim/Region/Framework/Scenes/SceneViewer.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneViewer.cs
@@ -179,6 +179,9 @@ namespace OpenSim.Region.Framework.Scenes
179 179
180 public void Reset() 180 public void Reset()
181 { 181 {
182 if (m_pendingObjects == null)
183 return;
184
182 lock (m_pendingObjects) 185 lock (m_pendingObjects)
183 { 186 {
184 if (m_pendingObjects != null) 187 if (m_pendingObjects != null)