From b20bd1a9dfdf9f7b7bb342f69832f7e7662ecaf2 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Sat, 21 Jan 2017 03:35:59 +0000 Subject: [PATCH] change the initialization point of SimwideArea --- .../Region/CoreModules/World/Land/LandManagementModule.cs | 6 ++++-- OpenSim/Region/CoreModules/World/Land/LandObject.cs | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs index 5d12f8b31a..66be5e5082 100644 --- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs +++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs @@ -287,8 +287,10 @@ namespace OpenSim.Region.CoreModules.World.Land fullSimParcel.SetLandBitmap(fullSimParcel.GetSquareLandBitmap(0, 0, (int)m_scene.RegionInfo.RegionSizeX, (int)m_scene.RegionInfo.RegionSizeY)); - fullSimParcel.LandData.OwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner; - fullSimParcel.LandData.ClaimDate = Util.UnixTimeSinceEpoch(); + LandData ldata = fullSimParcel.LandData; + ldata.SimwideArea = ldata.Area; + ldata.OwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner; + ldata.ClaimDate = Util.UnixTimeSinceEpoch(); return AddLandObject(fullSimParcel); } diff --git a/OpenSim/Region/CoreModules/World/Land/LandObject.cs b/OpenSim/Region/CoreModules/World/Land/LandObject.cs index ae79849ef2..3aca74160c 100644 --- a/OpenSim/Region/CoreModules/World/Land/LandObject.cs +++ b/OpenSim/Region/CoreModules/World/Land/LandObject.cs @@ -356,6 +356,7 @@ namespace OpenSim.Region.CoreModules.World.Land } } + // the total prims a parcel owner can have on a region public int GetSimulatorMaxPrimCount() { if (overrideSimulatorMaxPrimCount != null) @@ -370,7 +371,7 @@ namespace OpenSim.Region.CoreModules.World.Land * (double)m_scene.RegionInfo.RegionSettings.ObjectBonus / (long)(m_scene.RegionInfo.RegionSizeX * m_scene.RegionInfo.RegionSizeY) +0.5 ); - + // sanity check if(simMax > m_scene.RegionInfo.ObjectCapacity) simMax = m_scene.RegionInfo.ObjectCapacity; //m_log.DebugFormat("Simwide Area: {0}, Capacity {1}, SimMax {2}, SimWidePrims {3}", @@ -1045,7 +1046,6 @@ namespace OpenSim.Region.CoreModules.World.Land tempArea *= landUnit * landUnit; LandData.Area = tempArea; - LandData.SimwideArea = tempArea; } #endregion