diff options
author | lbsa71 | 2007-10-22 17:55:49 +0000 |
---|---|---|
committer | lbsa71 | 2007-10-22 17:55:49 +0000 |
commit | dd770c384c2e63cf8a1e2f522741afb8adfab4c2 (patch) | |
tree | 97bc7dacf15388d8b32639219ea51872961de2cd /OpenSim/Region/Environment/LandManagement | |
parent | after a small misunderstanding with the match group numbers (diff) | |
download | opensim-SC_OLD-dd770c384c2e63cf8a1e2f522741afb8adfab4c2.zip opensim-SC_OLD-dd770c384c2e63cf8a1e2f522741afb8adfab4c2.tar.gz opensim-SC_OLD-dd770c384c2e63cf8a1e2f522741afb8adfab4c2.tar.bz2 opensim-SC_OLD-dd770c384c2e63cf8a1e2f522741afb8adfab4c2.tar.xz |
* Made EstateSetting static since there's only one instance, and we only need to create it once
* Now cacheing RegionInfos indefinitively; we should add a tiomeout to this cache
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/LandManagement/Land.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/Environment/LandManagement/Land.cs b/OpenSim/Region/Environment/LandManagement/Land.cs index 0acafa7..7fb2221 100644 --- a/OpenSim/Region/Environment/LandManagement/Land.cs +++ b/OpenSim/Region/Environment/LandManagement/Land.cs | |||
@@ -135,7 +135,7 @@ namespace OpenSim.Region.Environment.LandManagement | |||
135 | updatePacket.ParcelData.MaxPrims = | 135 | updatePacket.ParcelData.MaxPrims = |
136 | Convert.ToInt32( | 136 | Convert.ToInt32( |
137 | Math.Round((Convert.ToDecimal(landData.area)/Convert.ToDecimal(65536))*15000* | 137 | Math.Round((Convert.ToDecimal(landData.area)/Convert.ToDecimal(65536))*15000* |
138 | Convert.ToDecimal(m_scene.RegionInfo.estateSettings.objectBonusFactor))); | 138 | Convert.ToDecimal(m_scene.RegionInfo.EstateSettings.objectBonusFactor))); |
139 | } | 139 | } |
140 | else | 140 | else |
141 | { | 141 | { |
@@ -152,12 +152,12 @@ namespace OpenSim.Region.Environment.LandManagement | |||
152 | updatePacket.ParcelData.OwnerID = landData.ownerID; | 152 | updatePacket.ParcelData.OwnerID = landData.ownerID; |
153 | updatePacket.ParcelData.OwnerPrims = landData.ownerPrims; | 153 | updatePacket.ParcelData.OwnerPrims = landData.ownerPrims; |
154 | updatePacket.ParcelData.ParcelFlags = landData.landFlags; | 154 | updatePacket.ParcelData.ParcelFlags = landData.landFlags; |
155 | updatePacket.ParcelData.ParcelPrimBonus = m_scene.RegionInfo.estateSettings.objectBonusFactor; | 155 | updatePacket.ParcelData.ParcelPrimBonus = m_scene.RegionInfo.EstateSettings.objectBonusFactor; |
156 | updatePacket.ParcelData.PassHours = landData.passHours; | 156 | updatePacket.ParcelData.PassHours = landData.passHours; |
157 | updatePacket.ParcelData.PassPrice = landData.passPrice; | 157 | updatePacket.ParcelData.PassPrice = landData.passPrice; |
158 | updatePacket.ParcelData.PublicCount = 0; //unemplemented | 158 | updatePacket.ParcelData.PublicCount = 0; //unemplemented |
159 | 159 | ||
160 | uint regionFlags = (uint) m_scene.RegionInfo.estateSettings.regionFlags; | 160 | uint regionFlags = (uint) m_scene.RegionInfo.EstateSettings.regionFlags; |
161 | updatePacket.ParcelData.RegionDenyAnonymous = ((regionFlags & (uint) Simulator.RegionFlags.DenyAnonymous) > | 161 | updatePacket.ParcelData.RegionDenyAnonymous = ((regionFlags & (uint) Simulator.RegionFlags.DenyAnonymous) > |
162 | 0); | 162 | 0); |
163 | updatePacket.ParcelData.RegionDenyIdentified = ((regionFlags & (uint) Simulator.RegionFlags.DenyIdentified) > | 163 | updatePacket.ParcelData.RegionDenyIdentified = ((regionFlags & (uint) Simulator.RegionFlags.DenyIdentified) > |
@@ -178,7 +178,7 @@ namespace OpenSim.Region.Environment.LandManagement | |||
178 | updatePacket.ParcelData.SimWideMaxPrims = | 178 | updatePacket.ParcelData.SimWideMaxPrims = |
179 | Convert.ToInt32( | 179 | Convert.ToInt32( |
180 | Math.Round((Convert.ToDecimal(landData.simwideArea)/Convert.ToDecimal(65536))*15000* | 180 | Math.Round((Convert.ToDecimal(landData.simwideArea)/Convert.ToDecimal(65536))*15000* |
181 | Convert.ToDecimal(m_scene.RegionInfo.estateSettings.objectBonusFactor))); | 181 | Convert.ToDecimal(m_scene.RegionInfo.EstateSettings.objectBonusFactor))); |
182 | } | 182 | } |
183 | else | 183 | else |
184 | { | 184 | { |