aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authoropensim mirror account2010-10-21 06:10:04 -0700
committeropensim mirror account2010-10-21 06:10:04 -0700
commit656b2f84a80ecd8ecb83143e7e698d79d49bc71d (patch)
treed6e6efba7379845f8c670e86434cbd73f53ad0d0 /OpenSim
parentMerge branch 'master' of /var/git/opensim/ (diff)
parentRemove a bit of dead code relating to ObjectCapacity (diff)
downloadopensim-SC-656b2f84a80ecd8ecb83143e7e698d79d49bc71d.zip
opensim-SC-656b2f84a80ecd8ecb83143e7e698d79d49bc71d.tar.gz
opensim-SC-656b2f84a80ecd8ecb83143e7e698d79d49bc71d.tar.bz2
opensim-SC-656b2f84a80ecd8ecb83143e7e698d79d49bc71d.tar.xz
Merge branch 'master' of /var/git/opensim/
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs2
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);