diff options
| author | Melanie | 2012-01-30 16:44:26 +0000 |
|---|---|---|
| committer | Melanie | 2012-01-30 16:44:26 +0000 |
| commit | ad02e01e771cbc301e067f8e4cb1ecda27296a22 (patch) | |
| tree | 07c57b734756ca42cc6e08be9b50daf8357a1541 /OpenSim/Region/CoreModules/World/Land | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Add the ability to abort a pending restart using the viewer UI or a (diff) | |
| download | opensim-SC-ad02e01e771cbc301e067f8e4cb1ecda27296a22.zip opensim-SC-ad02e01e771cbc301e067f8e4cb1ecda27296a22.tar.gz opensim-SC-ad02e01e771cbc301e067f8e4cb1ecda27296a22.tar.bz2 opensim-SC-ad02e01e771cbc301e067f8e4cb1ecda27296a22.tar.xz | |
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Land')
| -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 | } |