diff options
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Land/LandObject.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Land/LandObject.cs | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/World/Land/LandObject.cs b/OpenSim/Region/CoreModules/World/Land/LandObject.cs index 3945142..6864629 100644 --- a/OpenSim/Region/CoreModules/World/Land/LandObject.cs +++ b/OpenSim/Region/CoreModules/World/Land/LandObject.cs | |||
@@ -146,7 +146,7 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
146 | else | 146 | else |
147 | { | 147 | { |
148 | // Normal Calculations | 148 | // Normal Calculations |
149 | return (int)Math.Round(((float)LandData.Area / 65536.0f) * (float)m_scene.objectCapacity * (float)m_scene.RegionInfo.RegionSettings.ObjectBonus); | 149 | return (int)Math.Round(((float)LandData.Area / 65536.0f) * (float)m_scene.RegionInfo.ObjectCapacity * (float)m_scene.RegionInfo.RegionSettings.ObjectBonus); |
150 | } | 150 | } |
151 | } | 151 | } |
152 | public int GetSimulatorMaxPrimCount(ILandObject thisObject) | 152 | public int GetSimulatorMaxPrimCount(ILandObject thisObject) |
@@ -158,7 +158,7 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
158 | else | 158 | else |
159 | { | 159 | { |
160 | //Normal Calculations | 160 | //Normal Calculations |
161 | return m_scene.objectCapacity; | 161 | return m_scene.RegionInfo.ObjectCapacity; |
162 | } | 162 | } |
163 | } | 163 | } |
164 | #endregion | 164 | #endregion |
@@ -283,6 +283,9 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
283 | 283 | ||
284 | public bool IsBannedFromLand(UUID avatar) | 284 | public bool IsBannedFromLand(UUID avatar) |
285 | { | 285 | { |
286 | if (m_scene.Permissions.IsAdministrator(avatar)) | ||
287 | return false; | ||
288 | |||
286 | if ((LandData.Flags & (uint) ParcelFlags.UseBanList) > 0) | 289 | if ((LandData.Flags & (uint) ParcelFlags.UseBanList) > 0) |
287 | { | 290 | { |
288 | ParcelManager.ParcelAccessEntry entry = new ParcelManager.ParcelAccessEntry(); | 291 | ParcelManager.ParcelAccessEntry entry = new ParcelManager.ParcelAccessEntry(); |
@@ -301,6 +304,9 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
301 | 304 | ||
302 | public bool IsRestrictedFromLand(UUID avatar) | 305 | public bool IsRestrictedFromLand(UUID avatar) |
303 | { | 306 | { |
307 | if (m_scene.Permissions.IsAdministrator(avatar)) | ||
308 | return false; | ||
309 | |||
304 | if ((LandData.Flags & (uint) ParcelFlags.UseAccessList) > 0) | 310 | if ((LandData.Flags & (uint) ParcelFlags.UseAccessList) > 0) |
305 | { | 311 | { |
306 | ParcelManager.ParcelAccessEntry entry = new ParcelManager.ParcelAccessEntry(); | 312 | ParcelManager.ParcelAccessEntry entry = new ParcelManager.ParcelAccessEntry(); |