OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix a null ref on parcels join

0.9.0-post-fixes
UbitUmarov 2017-05-19 18:03:02 +01:00
parent 7c9615f000
commit 52dd683326
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
View File

@ -679,6 +679,7 @@ namespace OpenSim.Region.CoreModules.World.Land
public void removeLandObject(int local_id) public void removeLandObject(int local_id)
{ {
ILandObject land; ILandObject land;
UUID landGlobalID = UUID.Zero;
lock (m_landList) lock (m_landList)
{ {
for (int x = 0; x < m_landIDList.GetLength(0); x++) for (int x = 0; x < m_landIDList.GetLength(0); x++)
@ -697,12 +698,18 @@ namespace OpenSim.Region.CoreModules.World.Land
land = m_landList[local_id]; land = m_landList[local_id];
m_landList.Remove(local_id); m_landList.Remove(local_id);
if(land.LandData != null) if(land != null && land.LandData != null)
m_landUUIDList.Remove(land.LandData.GlobalID); {
land.Clear(); landGlobalID = land.LandData.GlobalID;
m_landUUIDList.Remove(landGlobalID);
}
} }
m_scene.EventManager.TriggerLandObjectRemoved(land.LandData.GlobalID); if(landGlobalID != UUID.Zero)
{
m_scene.EventManager.TriggerLandObjectRemoved(landGlobalID);
land.Clear();
}
} }
/// <summary> /// <summary>