aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs6
-rw-r--r--OpenSim/Region/CoreModules/World/Land/PrimCountModule.cs5
2 files changed, 8 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
index fac2574..2b5f7a0 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
@@ -766,9 +766,9 @@ namespace OpenSim.Region.CoreModules.World.Land
766 } 766 }
767 catch (IndexOutOfRangeException) 767 catch (IndexOutOfRangeException)
768 { 768 {
769 m_log.WarnFormat( 769// m_log.WarnFormat(
770 "[LAND MANAGEMENT MODULE]: Tried to retrieve land object from out of bounds co-ordinate ({0},{1}) in {2}", 770// "[LAND MANAGEMENT MODULE]: Tried to retrieve land object from out of bounds co-ordinate ({0},{1}) in {2}",
771 x, y, m_scene.RegionInfo.RegionName); 771// x, y, m_scene.RegionInfo.RegionName);
772 772
773 return null; 773 return null;
774 } 774 }
diff --git a/OpenSim/Region/CoreModules/World/Land/PrimCountModule.cs b/OpenSim/Region/CoreModules/World/Land/PrimCountModule.cs
index d1e2328..f07ae31 100644
--- a/OpenSim/Region/CoreModules/World/Land/PrimCountModule.cs
+++ b/OpenSim/Region/CoreModules/World/Land/PrimCountModule.cs
@@ -183,6 +183,11 @@ namespace OpenSim.Region.CoreModules.World.Land
183 183
184 Vector3 pos = obj.AbsolutePosition; 184 Vector3 pos = obj.AbsolutePosition;
185 ILandObject landObject = m_Scene.LandChannel.GetLandObject(pos.X, pos.Y); 185 ILandObject landObject = m_Scene.LandChannel.GetLandObject(pos.X, pos.Y);
186
187 // If for some reason there is no land object (perhaps the object is out of bounds) then we can't count it
188 if (landObject == null)
189 return;
190
186 LandData landData = landObject.LandData; 191 LandData landData = landObject.LandData;
187 192
188// m_log.DebugFormat( 193// m_log.DebugFormat(