aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clarke Casey2009-02-17 16:04:43 +0000
committerJustin Clarke Casey2009-02-17 16:04:43 +0000
commit46fd31346d3bc9ec4cf5cab2fcbf5e6ad09e4321 (patch)
treef307dd32134b1d18bd38cf93b141c1468c684bbe
parent* Apply http://opensimulator.org/mantis/view.php?id=3179 (diff)
downloadopensim-SC-46fd31346d3bc9ec4cf5cab2fcbf5e6ad09e4321.zip
opensim-SC-46fd31346d3bc9ec4cf5cab2fcbf5e6ad09e4321.tar.gz
opensim-SC-46fd31346d3bc9ec4cf5cab2fcbf5e6ad09e4321.tar.bz2
opensim-SC-46fd31346d3bc9ec4cf5cab2fcbf5e6ad09e4321.tar.xz
* Apply http://opensimulator.org/mantis/view.php?id=3178
* Moves llEmail() delay to after e-mail send rather than before, in line with SL * Thanks DoranZemlja * Last build failure looks like a glitch, but one that has already happened twice recently which I need to look at
-rw-r--r--OpenSim/Region/CoreModules/Scripting/EMailModules/EmailModule.cs11
1 files changed, 6 insertions, 5 deletions
diff --git a/OpenSim/Region/CoreModules/Scripting/EMailModules/EmailModule.cs b/OpenSim/Region/CoreModules/Scripting/EMailModules/EmailModule.cs
index f788433..2f9dd0c 100644
--- a/OpenSim/Region/CoreModules/Scripting/EMailModules/EmailModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/EMailModules/EmailModule.cs
@@ -266,9 +266,6 @@ namespace OpenSim.Region.CoreModules.Scripting.EmailModules
266 string LastObjectName = string.Empty; 266 string LastObjectName = string.Empty;
267 string LastObjectPosition = string.Empty; 267 string LastObjectPosition = string.Empty;
268 string LastObjectRegionName = string.Empty; 268 string LastObjectRegionName = string.Empty;
269 //DONE: Message as Second Life style
270 //20 second delay - AntiSpam System - for now only 10 seconds
271 DelayInSeconds(10);
272 269
273 resolveNamePositionRegionName(objectID, out LastObjectName, out LastObjectPosition, out LastObjectRegionName); 270 resolveNamePositionRegionName(objectID, out LastObjectName, out LastObjectPosition, out LastObjectRegionName);
274 271
@@ -310,7 +307,6 @@ namespace OpenSim.Region.CoreModules.Scripting.EmailModules
310 catch (Exception e) 307 catch (Exception e)
311 { 308 {
312 m_log.Error("[EMAIL] DefaultEmailModule Exception: " + e.Message); 309 m_log.Error("[EMAIL] DefaultEmailModule Exception: " + e.Message);
313 return;
314 } 310 }
315 } 311 }
316 else 312 else
@@ -324,7 +320,8 @@ namespace OpenSim.Region.CoreModules.Scripting.EmailModules
324 "\nRegion: " + LastObjectRegionName + "\nLocal-Position: " + 320 "\nRegion: " + LastObjectRegionName + "\nLocal-Position: " +
325 LastObjectPosition + "\n\n" + body; 321 LastObjectPosition + "\n\n" + body;
326 322
327 UUID toID = new UUID(address.Substring(0, address.IndexOf("@"))); 323 string guid = address.Substring(0, address.IndexOf("@"));
324 UUID toID = new UUID(guid);
328 325
329 if (IsLocal(toID)) // TODO FIX check to see if it is local 326 if (IsLocal(toID)) // TODO FIX check to see if it is local
330 { 327 {
@@ -337,6 +334,10 @@ namespace OpenSim.Region.CoreModules.Scripting.EmailModules
337 // TODO FIX 334 // TODO FIX
338 } 335 }
339 } 336 }
337
338 //DONE: Message as Second Life style
339 //20 second delay - AntiSpam System - for now only 10 seconds
340 DelayInSeconds(10);
340 } 341 }
341 342
342 /// <summary> 343 /// <summary>