diff options
author | Melanie | 2010-01-29 07:20:13 +0000 |
---|---|---|
committer | Melanie | 2010-01-29 07:21:06 +0000 |
commit | a87a247f0548d39a8c39b1d28123d7da8db44598 (patch) | |
tree | 7f9f77c38a224bc6d4bea7ccced1d4710c8a91b1 /OpenSim/Region/CoreModules/Scripting/EMailModules | |
parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
download | opensim-SC_OLD-a87a247f0548d39a8c39b1d28123d7da8db44598.zip opensim-SC_OLD-a87a247f0548d39a8c39b1d28123d7da8db44598.tar.gz opensim-SC_OLD-a87a247f0548d39a8c39b1d28123d7da8db44598.tar.bz2 opensim-SC_OLD-a87a247f0548d39a8c39b1d28123d7da8db44598.tar.xz |
Revert "Updates all IRegionModules to the new style region modules."
This reverts commit ec3c31e61e5e540f822891110df9bc978655bbaf.
Diffstat (limited to 'OpenSim/Region/CoreModules/Scripting/EMailModules')
-rw-r--r-- | OpenSim/Region/CoreModules/Scripting/EMailModules/EmailModule.cs | 32 |
1 files changed, 7 insertions, 25 deletions
diff --git a/OpenSim/Region/CoreModules/Scripting/EMailModules/EmailModule.cs b/OpenSim/Region/CoreModules/Scripting/EMailModules/EmailModule.cs index d6ed468..83f004d 100644 --- a/OpenSim/Region/CoreModules/Scripting/EMailModules/EmailModule.cs +++ b/OpenSim/Region/CoreModules/Scripting/EMailModules/EmailModule.cs | |||
@@ -32,7 +32,6 @@ using System.Text.RegularExpressions; | |||
32 | using DotNetOpenMail; | 32 | using DotNetOpenMail; |
33 | using DotNetOpenMail.SmtpAuth; | 33 | using DotNetOpenMail.SmtpAuth; |
34 | using log4net; | 34 | using log4net; |
35 | using Mono.Addins; | ||
36 | using Nini.Config; | 35 | using Nini.Config; |
37 | using OpenMetaverse; | 36 | using OpenMetaverse; |
38 | using OpenSim.Framework; | 37 | using OpenSim.Framework; |
@@ -41,7 +40,6 @@ using OpenSim.Region.Framework.Scenes; | |||
41 | 40 | ||
42 | namespace OpenSim.Region.CoreModules.Scripting.EmailModules | 41 | namespace OpenSim.Region.CoreModules.Scripting.EmailModules |
43 | { | 42 | { |
44 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")] | ||
45 | public class EmailModule : IEmailModule | 43 | public class EmailModule : IEmailModule |
46 | { | 44 | { |
47 | // | 45 | // |
@@ -96,7 +94,7 @@ namespace OpenSim.Region.CoreModules.Scripting.EmailModules | |||
96 | } | 94 | } |
97 | } | 95 | } |
98 | 96 | ||
99 | public void Initialise(IConfigSource config) | 97 | public void Initialise(Scene scene, IConfigSource config) |
100 | { | 98 | { |
101 | m_Config = config; | 99 | m_Config = config; |
102 | IConfig SMTPConfig; | 100 | IConfig SMTPConfig; |
@@ -138,16 +136,7 @@ namespace OpenSim.Region.CoreModules.Scripting.EmailModules | |||
138 | m_Enabled = false; | 136 | m_Enabled = false; |
139 | return; | 137 | return; |
140 | } | 138 | } |
141 | m_log.Info("[EMAIL] Activated DefaultEmailModule"); | ||
142 | } | ||
143 | |||
144 | public Type ReplaceableInterface | ||
145 | { | ||
146 | get { return null; } | ||
147 | } | ||
148 | 139 | ||
149 | public void AddRegion(Scene scene) | ||
150 | { | ||
151 | // It's a go! | 140 | // It's a go! |
152 | if (m_Enabled) | 141 | if (m_Enabled) |
153 | { | 142 | { |
@@ -166,20 +155,8 @@ namespace OpenSim.Region.CoreModules.Scripting.EmailModules | |||
166 | m_Scenes.Add(scene.RegionInfo.RegionHandle, scene); | 155 | m_Scenes.Add(scene.RegionInfo.RegionHandle, scene); |
167 | } | 156 | } |
168 | } | 157 | } |
169 | } | ||
170 | } | ||
171 | |||
172 | public void RegionLoaded(Scene scene) | ||
173 | { | ||
174 | } | ||
175 | 158 | ||
176 | public void RemoveRegion(Scene scene) | 159 | m_log.Info("[EMAIL] Activated DefaultEmailModule"); |
177 | { | ||
178 | scene.UnregisterModuleInterface<IEmailModule>(this); | ||
179 | |||
180 | if (m_Scenes.ContainsKey(scene.RegionInfo.RegionHandle)) | ||
181 | { | ||
182 | m_Scenes.Remove(scene.RegionInfo.RegionHandle); | ||
183 | } | 160 | } |
184 | } | 161 | } |
185 | 162 | ||
@@ -196,6 +173,11 @@ namespace OpenSim.Region.CoreModules.Scripting.EmailModules | |||
196 | get { return "DefaultEmailModule"; } | 173 | get { return "DefaultEmailModule"; } |
197 | } | 174 | } |
198 | 175 | ||
176 | public bool IsSharedModule | ||
177 | { | ||
178 | get { return true; } | ||
179 | } | ||
180 | |||
199 | /// <summary> | 181 | /// <summary> |
200 | /// Delay function using thread in seconds | 182 | /// Delay function using thread in seconds |
201 | /// </summary> | 183 | /// </summary> |