From 46fd31346d3bc9ec4cf5cab2fcbf5e6ad09e4321 Mon Sep 17 00:00:00 2001 From: Justin Clarke Casey Date: Tue, 17 Feb 2009 16:04:43 +0000 Subject: * 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 --- .../Region/CoreModules/Scripting/EMailModules/EmailModule.cs | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'OpenSim/Region') 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 string LastObjectName = string.Empty; string LastObjectPosition = string.Empty; string LastObjectRegionName = string.Empty; - //DONE: Message as Second Life style - //20 second delay - AntiSpam System - for now only 10 seconds - DelayInSeconds(10); resolveNamePositionRegionName(objectID, out LastObjectName, out LastObjectPosition, out LastObjectRegionName); @@ -310,7 +307,6 @@ namespace OpenSim.Region.CoreModules.Scripting.EmailModules catch (Exception e) { m_log.Error("[EMAIL] DefaultEmailModule Exception: " + e.Message); - return; } } else @@ -324,7 +320,8 @@ namespace OpenSim.Region.CoreModules.Scripting.EmailModules "\nRegion: " + LastObjectRegionName + "\nLocal-Position: " + LastObjectPosition + "\n\n" + body; - UUID toID = new UUID(address.Substring(0, address.IndexOf("@"))); + string guid = address.Substring(0, address.IndexOf("@")); + UUID toID = new UUID(guid); if (IsLocal(toID)) // TODO FIX check to see if it is local { @@ -337,6 +334,10 @@ namespace OpenSim.Region.CoreModules.Scripting.EmailModules // TODO FIX } } + + //DONE: Message as Second Life style + //20 second delay - AntiSpam System - for now only 10 seconds + DelayInSeconds(10); } /// -- cgit v1.1