diff options
| author | Melanie | 2010-10-21 20:26:29 +0100 |
|---|---|---|
| committer | Melanie | 2010-10-21 20:26:29 +0100 |
| commit | 28c4dd7931281f0b36a9d81cd17aef03057bcc39 (patch) | |
| tree | 6ea6acd8f8bd636e5f5c82edc9cc0bacedb7aabc /OpenSim/Region/OptionalModules | |
| parent | COnvert some funky K&R notation to proper (MS) style (diff) | |
| parent | This fixes a delay in llSetLinkPrimitiveParamsFast (diff) | |
| download | opensim-SC-28c4dd7931281f0b36a9d81cd17aef03057bcc39.zip opensim-SC-28c4dd7931281f0b36a9d81cd17aef03057bcc39.tar.gz opensim-SC-28c4dd7931281f0b36a9d81cd17aef03057bcc39.tar.bz2 opensim-SC-28c4dd7931281f0b36a9d81cd17aef03057bcc39.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/OptionalModules')
| -rw-r--r-- | OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs b/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs index 7e1b5ac..b84a34d 100644 --- a/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs +++ b/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs | |||
| @@ -83,7 +83,6 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule | |||
| 83 | 83 | ||
| 84 | // private int m_stipend = 1000; | 84 | // private int m_stipend = 1000; |
| 85 | 85 | ||
| 86 | // private int ObjectCapacity = 45000; | ||
| 87 | private int ObjectCount = 0; | 86 | private int ObjectCount = 0; |
| 88 | private int PriceEnergyUnit = 0; | 87 | private int PriceEnergyUnit = 0; |
| 89 | private int PriceGroupCreate = 0; | 88 | private int PriceGroupCreate = 0; |
| @@ -135,7 +134,6 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule | |||
| 135 | 134 | ||
| 136 | public void AddRegion(Scene scene) | 135 | public void AddRegion(Scene scene) |
| 137 | { | 136 | { |
| 138 | // Send ObjectCapacity to Scene.. Which sends it to the SimStatsReporter. | ||
| 139 | if (m_enabled) | 137 | if (m_enabled) |
| 140 | { | 138 | { |
| 141 | scene.RegisterModuleInterface<IMoneyModule>(this); | 139 | scene.RegisterModuleInterface<IMoneyModule>(this); |