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

change the initialization point of SimwideArea

httptests
UbitUmarov 2017-01-21 03:35:59 +00:00
parent 85a31c9e76
commit b20bd1a9df
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -287,8 +287,10 @@ namespace OpenSim.Region.CoreModules.World.Land
fullSimParcel.SetLandBitmap(fullSimParcel.GetSquareLandBitmap(0, 0, fullSimParcel.SetLandBitmap(fullSimParcel.GetSquareLandBitmap(0, 0,
(int)m_scene.RegionInfo.RegionSizeX, (int)m_scene.RegionInfo.RegionSizeY)); (int)m_scene.RegionInfo.RegionSizeX, (int)m_scene.RegionInfo.RegionSizeY));
fullSimParcel.LandData.OwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner; LandData ldata = fullSimParcel.LandData;
fullSimParcel.LandData.ClaimDate = Util.UnixTimeSinceEpoch(); ldata.SimwideArea = ldata.Area;
ldata.OwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner;
ldata.ClaimDate = Util.UnixTimeSinceEpoch();
return AddLandObject(fullSimParcel); return AddLandObject(fullSimParcel);
} }

4
OpenSim/Region/CoreModules/World/Land/LandObject.cs
View File

@ -356,6 +356,7 @@ namespace OpenSim.Region.CoreModules.World.Land
} }
} }
// the total prims a parcel owner can have on a region
public int GetSimulatorMaxPrimCount() public int GetSimulatorMaxPrimCount()
{ {
if (overrideSimulatorMaxPrimCount != null) if (overrideSimulatorMaxPrimCount != null)
@ -370,7 +371,7 @@ namespace OpenSim.Region.CoreModules.World.Land
* (double)m_scene.RegionInfo.RegionSettings.ObjectBonus * (double)m_scene.RegionInfo.RegionSettings.ObjectBonus
/ (long)(m_scene.RegionInfo.RegionSizeX * m_scene.RegionInfo.RegionSizeY) / (long)(m_scene.RegionInfo.RegionSizeX * m_scene.RegionInfo.RegionSizeY)
+0.5 ); +0.5 );
// sanity check
if(simMax > m_scene.RegionInfo.ObjectCapacity) if(simMax > m_scene.RegionInfo.ObjectCapacity)
simMax = m_scene.RegionInfo.ObjectCapacity; simMax = m_scene.RegionInfo.ObjectCapacity;
//m_log.DebugFormat("Simwide Area: {0}, Capacity {1}, SimMax {2}, SimWidePrims {3}", //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; tempArea *= landUnit * landUnit;
LandData.Area = tempArea; LandData.Area = tempArea;
LandData.SimwideArea = tempArea;
} }
#endregion #endregion