aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment
diff options
context:
space:
mode:
authorCharles Krinke2008-05-17 22:06:11 +0000
committerCharles Krinke2008-05-17 22:06:11 +0000
commit89056c492d77685419f0f2dad0db798e42164235 (patch)
tree9297d3d03dd86a63f1664a86c5c14460d3b4fdfa /OpenSim/Region/Environment
parentThank you kindly, KMeisthax for: Moving the PostInitialize() code to the (diff)
downloadopensim-SC-89056c492d77685419f0f2dad0db798e42164235.zip
opensim-SC-89056c492d77685419f0f2dad0db798e42164235.tar.gz
opensim-SC-89056c492d77685419f0f2dad0db798e42164235.tar.bz2
opensim-SC-89056c492d77685419f0f2dad0db798e42164235.tar.xz
Thank you very kindly, Melanie for:
The money module witll register (claim) an interface slot, even when disabled. This patch fixes it so that it will not register to supply this interface unless it's activated.
Diffstat (limited to 'OpenSim/Region/Environment')
-rw-r--r--OpenSim/Region/Environment/Modules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs5
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs
index fab546b..2aab82e 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs
@@ -133,13 +133,14 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney
133 IConfig startupConfig = m_gConfig.Configs["Startup"]; 133 IConfig startupConfig = m_gConfig.Configs["Startup"];
134 IConfig economyConfig = m_gConfig.Configs["Economy"]; 134 IConfig economyConfig = m_gConfig.Configs["Economy"];
135 135
136 scene.RegisterModuleInterface<IMoneyModule>(this);
137 136
138 ReadConfigAndPopulate(scene, startupConfig, "Startup"); 137 ReadConfigAndPopulate(scene, startupConfig, "Startup");
139 ReadConfigAndPopulate(scene, economyConfig, "Economy"); 138 ReadConfigAndPopulate(scene, economyConfig, "Economy");
140 139
141 if (m_enabled) 140 if (m_enabled)
142 { 141 {
142 scene.RegisterModuleInterface<IMoneyModule>(this);
143
143 lock (m_scenel) 144 lock (m_scenel)
144 { 145 {
145 if (m_scenel.Count == 0) 146 if (m_scenel.Count == 0)
@@ -1538,4 +1539,4 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney
1538 Gift = 2, 1539 Gift = 2,
1539 Purchase = 3 1540 Purchase = 3
1540 } 1541 }
1541} \ No newline at end of file 1542}