Change the order of actions to address a possible nullref

viewer-2-initial-appearance
Melanie 2010-10-08 18:40:13 +01:00
parent 1e66f79a4e
commit 5dcbbb726a
1 changed files with 2 additions and 3 deletions

View File

@ -179,11 +179,10 @@ namespace OpenSim.Region.Framework.Scenes
public void Reset() public void Reset()
{ {
if (m_pendingObjects != null) lock (m_pendingObjects)
{ {
lock (m_pendingObjects) if (m_pendingObjects != null)
{ {
m_pendingObjects.Clear(); m_pendingObjects.Clear();
m_pendingObjects = null; m_pendingObjects = null;
} }