aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/World
diff options
context:
space:
mode:
authorMelanie Thielker2010-07-14 03:59:26 +0200
committerMelanie2010-07-14 03:51:00 +0100
commitcd8bb316ea1bd0fc039c63ad75500a3b9c2d4248 (patch)
tree096fe80455443a31cb546c29f076287d2fab8b6a /OpenSim/Region/CoreModules/World
parentRevamp the permissions propagation. This MAY mess up. Please test. (diff)
downloadopensim-SC_OLD-cd8bb316ea1bd0fc039c63ad75500a3b9c2d4248.zip
opensim-SC_OLD-cd8bb316ea1bd0fc039c63ad75500a3b9c2d4248.tar.gz
opensim-SC_OLD-cd8bb316ea1bd0fc039c63ad75500a3b9c2d4248.tar.bz2
opensim-SC_OLD-cd8bb316ea1bd0fc039c63ad75500a3b9c2d4248.tar.xz
Remove getting the object capacity from the money module. It is now set
directly from the Region Info (and the region ini file)
Diffstat (limited to 'OpenSim/Region/CoreModules/World')
-rw-r--r--OpenSim/Region/CoreModules/World/Land/LandObject.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/World/Land/LandObject.cs b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
index 3945142..2a87da2 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