diff options
| author | Justin Clark-Casey (justincc) | 2010-07-14 17:13:04 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2010-07-14 17:13:04 +0100 |
| commit | 0080c3b1f4467224885323e7198c91d7e221f75b (patch) | |
| tree | 82fcfd5dd7fd3c9df8c467e5a423b792357384b3 /OpenSim/Region/CoreModules/World | |
| parent | Fix obvious bug in XInventoryService.GetFolderItems() which was preventing th... (diff) | |
| parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
| download | opensim-SC-0080c3b1f4467224885323e7198c91d7e221f75b.zip opensim-SC-0080c3b1f4467224885323e7198c91d7e221f75b.tar.gz opensim-SC-0080c3b1f4467224885323e7198c91d7e221f75b.tar.bz2 opensim-SC-0080c3b1f4467224885323e7198c91d7e221f75b.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/CoreModules/World')
| -rw-r--r-- | OpenSim/Region/CoreModules/World/Land/LandObject.cs | 4 |
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 |