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/OptionalModules/World/MoneyModule/SampleMoneyModule.cs | |
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_OLD-0080c3b1f4467224885323e7198c91d7e221f75b.zip opensim-SC_OLD-0080c3b1f4467224885323e7198c91d7e221f75b.tar.gz opensim-SC_OLD-0080c3b1f4467224885323e7198c91d7e221f75b.tar.bz2 opensim-SC_OLD-0080c3b1f4467224885323e7198c91d7e221f75b.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs')
-rw-r--r-- | OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs b/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs index 6f5ef9e..653f856 100644 --- a/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs +++ b/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs | |||
@@ -138,8 +138,6 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule | |||
138 | public void AddRegion(Scene scene) | 138 | public void AddRegion(Scene scene) |
139 | { | 139 | { |
140 | // Send ObjectCapacity to Scene.. Which sends it to the SimStatsReporter. | 140 | // Send ObjectCapacity to Scene.. Which sends it to the SimStatsReporter. |
141 | scene.SetObjectCapacity(ObjectCapacity); | ||
142 | |||
143 | if (m_enabled) | 141 | if (m_enabled) |
144 | { | 142 | { |
145 | scene.RegisterModuleInterface<IMoneyModule>(this); | 143 | scene.RegisterModuleInterface<IMoneyModule>(this); |
@@ -252,7 +250,6 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule | |||
252 | 250 | ||
253 | if (config == "Economy" && startupConfig != null) | 251 | if (config == "Economy" && startupConfig != null) |
254 | { | 252 | { |
255 | ObjectCapacity = startupConfig.GetInt("ObjectCapacity", 45000); | ||
256 | PriceEnergyUnit = startupConfig.GetInt("PriceEnergyUnit", 100); | 253 | PriceEnergyUnit = startupConfig.GetInt("PriceEnergyUnit", 100); |
257 | PriceObjectClaim = startupConfig.GetInt("PriceObjectClaim", 10); | 254 | PriceObjectClaim = startupConfig.GetInt("PriceObjectClaim", 10); |
258 | PricePublicObjectDecay = startupConfig.GetInt("PricePublicObjectDecay", 4); | 255 | PricePublicObjectDecay = startupConfig.GetInt("PricePublicObjectDecay", 4); |
@@ -701,7 +698,9 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule | |||
701 | 698 | ||
702 | if (user != null) | 699 | if (user != null) |
703 | { | 700 | { |
704 | user.SendEconomyData(EnergyEfficiency, ObjectCapacity, ObjectCount, PriceEnergyUnit, PriceGroupCreate, | 701 | Scene s = LocateSceneClientIn(user.AgentId); |
702 | |||
703 | user.SendEconomyData(EnergyEfficiency, s.RegionInfo.ObjectCapacity, ObjectCount, PriceEnergyUnit, PriceGroupCreate, | ||
705 | PriceObjectClaim, PriceObjectRent, PriceObjectScaleFactor, PriceParcelClaim, PriceParcelClaimFactor, | 704 | PriceObjectClaim, PriceObjectRent, PriceObjectScaleFactor, PriceParcelClaim, PriceParcelClaimFactor, |
706 | PriceParcelRent, PricePublicObjectDecay, PricePublicObjectDelete, PriceRentLight, PriceUpload, | 705 | PriceParcelRent, PricePublicObjectDecay, PricePublicObjectDelete, PriceRentLight, PriceUpload, |
707 | TeleportMinPrice, TeleportPriceExponent); | 706 | TeleportMinPrice, TeleportPriceExponent); |