ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-08 10:15:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove getting the object capacity from the money module. It is now set

Browse Source 
directly from the Region Info (and the region ini file)
This commit is contained in:
Melanie Thielker
2010-07-14 03:59:26 +02:00
committed by Melanie
parent dd14016885
commit cd8bb316ea
3 changed files with 6 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Region/CoreModules/World/Land/LandObject.cs
View File

@@ -146,7 +146,7 @@ namespace OpenSim.Region.CoreModules.World.Land
else
{
// Normal Calculations
return (int)Math.Round(((float)LandData.Area / 65536.0f) * (float)m_scene.objectCapacity * (float)m_scene.RegionInfo.RegionSettings.ObjectBonus);
return (int)Math.Round(((float)LandData.Area / 65536.0f) * (float)m_scene.RegionInfo.ObjectCapacity * (float)m_scene.RegionInfo.RegionSettings.ObjectBonus);
}
}
public int GetSimulatorMaxPrimCount(ILandObject thisObject)
@@ -158,7 +158,7 @@ namespace OpenSim.Region.CoreModules.World.Land
else
{
//Normal Calculations
return m_scene.objectCapacity;
return m_scene.RegionInfo.ObjectCapacity;
}
}
#endregion