diff options
author | Melanie | 2012-01-28 21:23:54 +0100 |
---|---|---|
committer | Melanie | 2012-01-28 21:23:54 +0100 |
commit | 498fe1afe76e565b28631d8da954ac9105e9a1a9 (patch) | |
tree | 4dbcfae4e885ea3b19a7af7f7ace4993a3de031f /OpenSim/Region/CoreModules/World/Land/LandObject.cs | |
parent | Prevent an overlong description from messing up a ParcelInfoReply (diff) | |
download | opensim-SC_OLD-498fe1afe76e565b28631d8da954ac9105e9a1a9.zip opensim-SC_OLD-498fe1afe76e565b28631d8da954ac9105e9a1a9.tar.gz opensim-SC_OLD-498fe1afe76e565b28631d8da954ac9105e9a1a9.tar.bz2 opensim-SC_OLD-498fe1afe76e565b28631d8da954ac9105e9a1a9.tar.xz |
Fix calculating land prim count type width issue
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Land/LandObject.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Land/LandObject.cs | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/OpenSim/Region/CoreModules/World/Land/LandObject.cs b/OpenSim/Region/CoreModules/World/Land/LandObject.cs index 2d54ed1..07b28c7 100644 --- a/OpenSim/Region/CoreModules/World/Land/LandObject.cs +++ b/OpenSim/Region/CoreModules/World/Land/LandObject.cs | |||
@@ -190,10 +190,10 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
190 | else | 190 | else |
191 | { | 191 | { |
192 | // Normal Calculations | 192 | // Normal Calculations |
193 | int parcelMax = (int)((double)(LandData.Area | 193 | int parcelMax = (int)((long)LandData.Area |
194 | * m_scene.RegionInfo.ObjectCapacity) | 194 | * (long)m_scene.RegionInfo.ObjectCapacity |
195 | * m_scene.RegionInfo.RegionSettings.ObjectBonus) | 195 | * (long)m_scene.RegionInfo.RegionSettings.ObjectBonus |
196 | / 65536; | 196 | / 65536L); |
197 | m_log.DebugFormat("Area: {0}, Capacity {1}, Bonus {2}, Parcel {3}", LandData.Area, m_scene.RegionInfo.ObjectCapacity, m_scene.RegionInfo.RegionSettings.ObjectBonus, parcelMax); | 197 | m_log.DebugFormat("Area: {0}, Capacity {1}, Bonus {2}, Parcel {3}", LandData.Area, m_scene.RegionInfo.ObjectCapacity, m_scene.RegionInfo.RegionSettings.ObjectBonus, parcelMax); |
198 | return parcelMax; | 198 | return parcelMax; |
199 | } | 199 | } |
@@ -208,9 +208,9 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
208 | else | 208 | else |
209 | { | 209 | { |
210 | // Normal Calculations | 210 | // Normal Calculations |
211 | int parcelMax = LandData.Area | 211 | int parcelMax = (int)((long)LandData.Area |
212 | * m_scene.RegionInfo.ObjectCapacity | 212 | * (long)m_scene.RegionInfo.ObjectCapacity |
213 | / 65536; | 213 | / 65536L); |
214 | return parcelMax; | 214 | return parcelMax; |
215 | } | 215 | } |
216 | } | 216 | } |
@@ -226,7 +226,7 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
226 | //Normal Calculations | 226 | //Normal Calculations |
227 | int simMax = (int)((long)LandData.SimwideArea | 227 | int simMax = (int)((long)LandData.SimwideArea |
228 | * (long)m_scene.RegionInfo.ObjectCapacity / 65536L); | 228 | * (long)m_scene.RegionInfo.ObjectCapacity / 65536L); |
229 | m_log.DebugFormat("Simwide Area: {0}, Capacity {1}, SimMax {2}", LandData.SimwideArea, m_scene.RegionInfo.ObjectCapacity, simMax); | 229 | // m_log.DebugFormat("Simwide Area: {0}, Capacity {1}, SimMax {2}", LandData.SimwideArea, m_scene.RegionInfo.ObjectCapacity, simMax); |
230 | return simMax; | 230 | return simMax; |
231 | } | 231 | } |
232 | } | 232 | } |