From 1bbc7fd6aa1cc19ec1bf7387b411377aab9b1243 Mon Sep 17 00:00:00 2001
From: UbitUmarov <ajlduarte@sapo.pt>
Date: Sun, 23 Aug 2020 02:14:52 +0100
Subject: [PATCH] avoid a null ref

---
 .../Region/CoreModules/World/Land/LandManagementModule.cs   | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
index 20704b15eb..6bf227bc33 100755
--- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
@@ -2152,7 +2152,8 @@ namespace OpenSim.Region.CoreModules.World.Land
 
                         extLandData.LandData = extLandObject.LandData;
                         extLandData.RegionAccess = m_scene.RegionInfo.AccessLevel;
-                        data = extLandData;
+                        if (extLandData.LandData != null)
+                            data = extLandData;
                         break;
                     }
                     else
@@ -2161,7 +2162,8 @@ namespace OpenSim.Region.CoreModules.World.Land
                         extLandData.LandData = landService.GetLandData(m_scene.RegionInfo.ScopeID,
                                 extLandData.RegionHandle, extLandData.X, extLandData.Y,
                                 out extLandData.RegionAccess);
-                        data = extLandData;
+                        if (extLandData.LandData != null)
+                            data = extLandData;
                         break;
                     }
                 }