diff options
Updates all IRegionModules to the new style region modules.
Signed-off-by: Melanie <melanie@t-data.com>
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/Scripting/EMailModules/EmailModule.cs | 32 |
1 files changed, 25 insertions, 7 deletions
diff --git a/OpenSim/Region/CoreModules/Scripting/EMailModules/EmailModule.cs b/OpenSim/Region/CoreModules/Scripting/EMailModules/EmailModule.cs index 83f004d..d6ed468 100644 --- a/OpenSim/Region/CoreModules/Scripting/EMailModules/EmailModule.cs +++ b/OpenSim/Region/CoreModules/Scripting/EMailModules/EmailModule.cs | |||
@@ -32,6 +32,7 @@ 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; | ||
35 | using Nini.Config; | 36 | using Nini.Config; |
36 | using OpenMetaverse; | 37 | using OpenMetaverse; |
37 | using OpenSim.Framework; | 38 | using OpenSim.Framework; |
@@ -40,6 +41,7 @@ using OpenSim.Region.Framework.Scenes; | |||
40 | 41 | ||
41 | namespace OpenSim.Region.CoreModules.Scripting.EmailModules | 42 | namespace OpenSim.Region.CoreModules.Scripting.EmailModules |
42 | { | 43 | { |
44 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")] | ||
43 | public class EmailModule : IEmailModule | 45 | public class EmailModule : IEmailModule |
44 | { | 46 | { |
45 | // | 47 | // |
@@ -94,7 +96,7 @@ namespace OpenSim.Region.CoreModules.Scripting.EmailModules | |||
94 | } | 96 | } |
95 | } | 97 | } |
96 | 98 | ||
97 | public void Initialise(Scene scene, IConfigSource config) | 99 | public void Initialise(IConfigSource config) |
98 | { | 100 | { |
99 | m_Config = config; | 101 | m_Config = config; |
100 | IConfig SMTPConfig; | 102 | IConfig SMTPConfig; |
@@ -136,7 +138,16 @@ namespace OpenSim.Region.CoreModules.Scripting.EmailModules | |||
136 | m_Enabled = false; | 138 | m_Enabled = false; |
137 | return; | 139 | return; |
138 | } | 140 | } |
141 | m_log.Info("[EMAIL] Activated DefaultEmailModule"); | ||
142 | } | ||
143 | |||
144 | public Type ReplaceableInterface | ||
145 | { | ||
146 | get { return null; } | ||
147 | } | ||
139 | 148 | ||
149 | public void AddRegion(Scene scene) | ||
150 | { | ||
140 | // It's a go! | 151 | // It's a go! |
141 | if (m_Enabled) | 152 | if (m_Enabled) |
142 | { | 153 | { |
@@ -155,8 +166,20 @@ namespace OpenSim.Region.CoreModules.Scripting.EmailModules | |||
155 | m_Scenes.Add(scene.RegionInfo.RegionHandle, scene); | 166 | m_Scenes.Add(scene.RegionInfo.RegionHandle, scene); |
156 | } | 167 | } |
157 | } | 168 | } |
169 | } | ||
170 | } | ||
158 | 171 | ||
159 | m_log.Info("[EMAIL] Activated DefaultEmailModule"); | 172 | public void RegionLoaded(Scene scene) |
173 | { | ||
174 | } | ||
175 | |||
176 | public void RemoveRegion(Scene scene) | ||
177 | { | ||
178 | scene.UnregisterModuleInterface<IEmailModule>(this); | ||
179 | |||
180 | if (m_Scenes.ContainsKey(scene.RegionInfo.RegionHandle)) | ||
181 | { | ||
182 | m_Scenes.Remove(scene.RegionInfo.RegionHandle); | ||
160 | } | 183 | } |
161 | } | 184 | } |
162 | 185 | ||
@@ -173,11 +196,6 @@ namespace OpenSim.Region.CoreModules.Scripting.EmailModules | |||
173 | get { return "DefaultEmailModule"; } | 196 | get { return "DefaultEmailModule"; } |
174 | } | 197 | } |
175 | 198 | ||
176 | public bool IsSharedModule | ||
177 | { | ||
178 | get { return true; } | ||
179 | } | ||
180 | |||
181 | /// <summary> | 199 | /// <summary> |
182 | /// Delay function using thread in seconds | 200 | /// Delay function using thread in seconds |
183 | /// </summary> | 201 | /// </summary> |