diff options
author | Master ScienceSim | 2010-10-28 09:09:42 -0700 |
---|---|---|
committer | Master ScienceSim | 2010-10-28 09:09:42 -0700 |
commit | f2c1d0e34feba801ff85c35ee049ed6d3067bb0d (patch) | |
tree | ff692ecc0db2b9cdf4cacd5a42234a5bb58ddd34 /OpenSim/Region/OptionalModules/World | |
parent | Added background thread to handle delayed send and save of appearance (diff) | |
parent | Formatting cleanup. (diff) | |
download | opensim-SC-f2c1d0e34feba801ff85c35ee049ed6d3067bb0d.zip opensim-SC-f2c1d0e34feba801ff85c35ee049ed6d3067bb0d.tar.gz opensim-SC-f2c1d0e34feba801ff85c35ee049ed6d3067bb0d.tar.bz2 opensim-SC-f2c1d0e34feba801ff85c35ee049ed6d3067bb0d.tar.xz |
Merge branch 'opensim-master' into dev-appearance
Diffstat (limited to 'OpenSim/Region/OptionalModules/World')
-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); |