diff options
Diffstat (limited to 'OpenSim/Region/Environment/Modules/Scripting/EMailModules')
-rw-r--r-- | OpenSim/Region/Environment/Modules/Scripting/EMailModules/EmailModule.cs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Region/Environment/Modules/Scripting/EMailModules/EmailModule.cs b/OpenSim/Region/Environment/Modules/Scripting/EMailModules/EmailModule.cs index bcf3e76..5a715f5 100644 --- a/OpenSim/Region/Environment/Modules/Scripting/EMailModules/EmailModule.cs +++ b/OpenSim/Region/Environment/Modules/Scripting/EMailModules/EmailModule.cs | |||
@@ -29,7 +29,7 @@ using System; | |||
29 | using System.Reflection; | 29 | using System.Reflection; |
30 | using System.Collections.Generic; | 30 | using System.Collections.Generic; |
31 | using System.Text.RegularExpressions; | 31 | using System.Text.RegularExpressions; |
32 | using libsecondlife; | 32 | using OpenMetaverse; |
33 | using OpenSim.Framework; | 33 | using OpenSim.Framework; |
34 | using OpenSim.Region.Environment.Interfaces; | 34 | using OpenSim.Region.Environment.Interfaces; |
35 | using OpenSim.Region.Environment.Scenes; | 35 | using OpenSim.Region.Environment.Scenes; |
@@ -161,7 +161,7 @@ namespace OpenSim.Region.Environment.Modules.Scripting.EmailModules | |||
161 | } | 161 | } |
162 | } | 162 | } |
163 | 163 | ||
164 | private SceneObjectPart findPrim(LLUUID objectID, out string ObjectRegionName) | 164 | private SceneObjectPart findPrim(UUID objectID, out string ObjectRegionName) |
165 | { | 165 | { |
166 | lock (m_Scenes) | 166 | lock (m_Scenes) |
167 | { | 167 | { |
@@ -179,7 +179,7 @@ namespace OpenSim.Region.Environment.Modules.Scripting.EmailModules | |||
179 | return null; | 179 | return null; |
180 | } | 180 | } |
181 | 181 | ||
182 | private void resolveNamePositionRegionName(LLUUID objectID, out string ObjectName, out string ObjectAbsolutePosition, out string ObjectRegionName) | 182 | private void resolveNamePositionRegionName(UUID objectID, out string ObjectName, out string ObjectAbsolutePosition, out string ObjectRegionName) |
183 | { | 183 | { |
184 | string m_ObjectRegionName; | 184 | string m_ObjectRegionName; |
185 | SceneObjectPart part = findPrim(objectID, out m_ObjectRegionName); | 185 | SceneObjectPart part = findPrim(objectID, out m_ObjectRegionName); |
@@ -203,7 +203,7 @@ namespace OpenSim.Region.Environment.Modules.Scripting.EmailModules | |||
203 | /// <param name="address"></param> | 203 | /// <param name="address"></param> |
204 | /// <param name="subject"></param> | 204 | /// <param name="subject"></param> |
205 | /// <param name="body"></param> | 205 | /// <param name="body"></param> |
206 | public void SendEmail(LLUUID objectID, string address, string subject, string body) | 206 | public void SendEmail(UUID objectID, string address, string subject, string body) |
207 | { | 207 | { |
208 | //Check if address is empty | 208 | //Check if address is empty |
209 | if (address == string.Empty) | 209 | if (address == string.Empty) |
@@ -240,7 +240,7 @@ namespace OpenSim.Region.Environment.Modules.Scripting.EmailModules | |||
240 | //Creation EmailMessage | 240 | //Creation EmailMessage |
241 | EmailMessage emailMessage = new EmailMessage(); | 241 | EmailMessage emailMessage = new EmailMessage(); |
242 | //From | 242 | //From |
243 | emailMessage.FromAddress = new EmailAddress(objectID.UUID.ToString()+"@"+m_HostName); | 243 | emailMessage.FromAddress = new EmailAddress(objectID.ToString()+"@"+m_HostName); |
244 | //To - Only One | 244 | //To - Only One |
245 | emailMessage.AddToAddress(new EmailAddress(address)); | 245 | emailMessage.AddToAddress(new EmailAddress(address)); |
246 | //Subject | 246 | //Subject |
@@ -264,7 +264,7 @@ namespace OpenSim.Region.Environment.Modules.Scripting.EmailModules | |||
264 | //Send Email Message | 264 | //Send Email Message |
265 | emailMessage.Send(smtpServer); | 265 | emailMessage.Send(smtpServer); |
266 | //Log | 266 | //Log |
267 | m_log.Info("[EMAIL] EMail sent to: " + address + " from object: " + objectID.UUID.ToString()); | 267 | m_log.Info("[EMAIL] EMail sent to: " + address + " from object: " + objectID.ToString()); |
268 | } | 268 | } |
269 | catch (Exception e) | 269 | catch (Exception e) |
270 | { | 270 | { |
@@ -280,7 +280,7 @@ namespace OpenSim.Region.Environment.Modules.Scripting.EmailModules | |||
280 | /// <param name="sender"></param> | 280 | /// <param name="sender"></param> |
281 | /// <param name="subject"></param> | 281 | /// <param name="subject"></param> |
282 | /// <returns></returns> | 282 | /// <returns></returns> |
283 | public Email GetNextEmail(LLUUID objectID, string sender, string subject) | 283 | public Email GetNextEmail(UUID objectID, string sender, string subject) |
284 | { | 284 | { |
285 | return null; | 285 | return null; |
286 | } | 286 | } |