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

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
parent c5891c14c7
commit af13c80d68
3 changed files with 6 additions and 23 deletions

View File

@@ -138,8 +138,6 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
public void AddRegion(Scene scene)
{
// Send ObjectCapacity to Scene.. Which sends it to the SimStatsReporter.
scene.SetObjectCapacity(ObjectCapacity);
if (m_enabled)
{
scene.RegisterModuleInterface<IMoneyModule>(this);
@@ -252,7 +250,6 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
if (config == "Economy" && startupConfig != null)
{
ObjectCapacity = startupConfig.GetInt("ObjectCapacity", 45000);
PriceEnergyUnit = startupConfig.GetInt("PriceEnergyUnit", 100);
PriceObjectClaim = startupConfig.GetInt("PriceObjectClaim", 10);
PricePublicObjectDecay = startupConfig.GetInt("PricePublicObjectDecay", 4);
@@ -701,7 +698,9 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
if (user != null)
{
user.SendEconomyData(EnergyEfficiency, ObjectCapacity, ObjectCount, PriceEnergyUnit, PriceGroupCreate,
Scene s = LocateSceneClientIn(user.AgentId);
user.SendEconomyData(EnergyEfficiency, s.RegionInfo.ObjectCapacity, ObjectCount, PriceEnergyUnit, PriceGroupCreate,
PriceObjectClaim, PriceObjectRent, PriceObjectScaleFactor, PriceParcelClaim, PriceParcelClaimFactor,
PriceParcelRent, PricePublicObjectDecay, PricePublicObjectDelete, PriceRentLight, PriceUpload,
TeleportMinPrice, TeleportPriceExponent);