diff options
author | Teravus Ovares | 2008-04-15 06:21:44 +0000 |
---|---|---|
committer | Teravus Ovares | 2008-04-15 06:21:44 +0000 |
commit | 682f4e9257bcec6e9690145760558cc3331bc5d8 (patch) | |
tree | cc3a7212426a9b5877ead378ad35a339663a838e /OpenSim/Region/Environment/Modules/LandManagement | |
parent | * Committing shell of a whole-region serialiser. This is not complete and wil... (diff) | |
download | opensim-SC-682f4e9257bcec6e9690145760558cc3331bc5d8.zip opensim-SC-682f4e9257bcec6e9690145760558cc3331bc5d8.tar.gz opensim-SC-682f4e9257bcec6e9690145760558cc3331bc5d8.tar.bz2 opensim-SC-682f4e9257bcec6e9690145760558cc3331bc5d8.tar.xz |
* Fixes an issue with the BaseHttpServer in Linux
* Fixes an estate naming issue
* Fixes a land issue with the landobject not reporting the proper parcel prim.
* A few other tweaks.
Diffstat (limited to 'OpenSim/Region/Environment/Modules/LandManagement')
-rw-r--r-- | OpenSim/Region/Environment/Modules/LandManagement/LandObject.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Environment/Modules/LandManagement/LandObject.cs b/OpenSim/Region/Environment/Modules/LandManagement/LandObject.cs index 161434e..69d3c05 100644 --- a/OpenSim/Region/Environment/Modules/LandManagement/LandObject.cs +++ b/OpenSim/Region/Environment/Modules/LandManagement/LandObject.cs | |||
@@ -172,7 +172,7 @@ namespace OpenSim.Region.Environment.Modules.LandManagement | |||
172 | { | 172 | { |
173 | updatePacket.ParcelData.MaxPrims = | 173 | updatePacket.ParcelData.MaxPrims = |
174 | Convert.ToInt32( | 174 | Convert.ToInt32( |
175 | Math.Round((Convert.ToDecimal(landData.area)/Convert.ToDecimal(65536))*15000* | 175 | Math.Round((Convert.ToDecimal(landData.area)/Convert.ToDecimal(65536))*m_scene.objectCapacity* |
176 | Convert.ToDecimal(m_scene.RegionInfo.EstateSettings.objectBonusFactor))); | 176 | Convert.ToDecimal(m_scene.RegionInfo.EstateSettings.objectBonusFactor))); |
177 | } | 177 | } |
178 | else | 178 | else |
@@ -194,7 +194,7 @@ namespace OpenSim.Region.Environment.Modules.LandManagement | |||
194 | updatePacket.ParcelData.PassHours = landData.passHours; | 194 | updatePacket.ParcelData.PassHours = landData.passHours; |
195 | updatePacket.ParcelData.PassPrice = landData.passPrice; | 195 | updatePacket.ParcelData.PassPrice = landData.passPrice; |
196 | updatePacket.ParcelData.PublicCount = 0; //unemplemented | 196 | updatePacket.ParcelData.PublicCount = 0; //unemplemented |
197 | 197 | ||
198 | uint regionFlags = (uint) m_scene.RegionInfo.EstateSettings.regionFlags; | 198 | uint regionFlags = (uint) m_scene.RegionInfo.EstateSettings.regionFlags; |
199 | updatePacket.ParcelData.RegionDenyAnonymous = ((regionFlags & (uint) Simulator.RegionFlags.DenyAnonymous) > | 199 | updatePacket.ParcelData.RegionDenyAnonymous = ((regionFlags & (uint) Simulator.RegionFlags.DenyAnonymous) > |
200 | 0); | 200 | 0); |
@@ -215,7 +215,7 @@ namespace OpenSim.Region.Environment.Modules.LandManagement | |||
215 | { | 215 | { |
216 | updatePacket.ParcelData.SimWideMaxPrims = | 216 | updatePacket.ParcelData.SimWideMaxPrims = |
217 | Convert.ToInt32( | 217 | Convert.ToInt32( |
218 | Math.Round((Convert.ToDecimal(landData.simwideArea)/Convert.ToDecimal(65536))*15000* | 218 | Math.Round((Convert.ToDecimal(landData.simwideArea) / Convert.ToDecimal(65536)) * m_scene.objectCapacity * |
219 | Convert.ToDecimal(m_scene.RegionInfo.EstateSettings.objectBonusFactor))); | 219 | Convert.ToDecimal(m_scene.RegionInfo.EstateSettings.objectBonusFactor))); |
220 | } | 220 | } |
221 | else | 221 | else |