Change the order of actions to address a possible nullref
parent
1e66f79a4e
commit
5dcbbb726a
|
@ -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;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue