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

Fix calculating land prim count type width issue

avinationmerge
Melanie 2012-01-28 21:23:54 +01:00
parent dac826da4e
commit 498fe1afe7
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -190,10 +190,10 @@ namespace OpenSim.Region.CoreModules.World.Land
else else
{ {
// Normal Calculations // Normal Calculations
int parcelMax = (int)((double)(LandData.Area int parcelMax = (int)((long)LandData.Area
* m_scene.RegionInfo.ObjectCapacity) * (long)m_scene.RegionInfo.ObjectCapacity
* m_scene.RegionInfo.RegionSettings.ObjectBonus) * (long)m_scene.RegionInfo.RegionSettings.ObjectBonus
/ 65536; / 65536L);
m_log.DebugFormat("Area: {0}, Capacity {1}, Bonus {2}, Parcel {3}", LandData.Area, m_scene.RegionInfo.ObjectCapacity, m_scene.RegionInfo.RegionSettings.ObjectBonus, parcelMax); m_log.DebugFormat("Area: {0}, Capacity {1}, Bonus {2}, Parcel {3}", LandData.Area, m_scene.RegionInfo.ObjectCapacity, m_scene.RegionInfo.RegionSettings.ObjectBonus, parcelMax);
return parcelMax; return parcelMax;
} }
@ -208,9 +208,9 @@ namespace OpenSim.Region.CoreModules.World.Land
else else
{ {
// Normal Calculations // Normal Calculations
int parcelMax = LandData.Area int parcelMax = (int)((long)LandData.Area
* m_scene.RegionInfo.ObjectCapacity * (long)m_scene.RegionInfo.ObjectCapacity
/ 65536; / 65536L);
return parcelMax; return parcelMax;
} }
} }
@ -226,7 +226,7 @@ namespace OpenSim.Region.CoreModules.World.Land
//Normal Calculations //Normal Calculations
int simMax = (int)((long)LandData.SimwideArea int simMax = (int)((long)LandData.SimwideArea
* (long)m_scene.RegionInfo.ObjectCapacity / 65536L); * (long)m_scene.RegionInfo.ObjectCapacity / 65536L);
m_log.DebugFormat("Simwide Area: {0}, Capacity {1}, SimMax {2}", LandData.SimwideArea, m_scene.RegionInfo.ObjectCapacity, simMax); // m_log.DebugFormat("Simwide Area: {0}, Capacity {1}, SimMax {2}", LandData.SimwideArea, m_scene.RegionInfo.ObjectCapacity, simMax);
return simMax; return simMax;
} }
} }