OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* 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
0.6.3-post-fixes
Justin Clarke Casey 2009-02-17 16:04:43 +00:00
parent 6bcf7cbb2c
commit 46fd31346d
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
OpenSim/Region/CoreModules/Scripting/EMailModules/EmailModule.cs
View File

@ -266,9 +266,6 @@ namespace OpenSim.Region.CoreModules.Scripting.EmailModules
string LastObjectName = string.Empty; string LastObjectName = string.Empty;
string LastObjectPosition = string.Empty; string LastObjectPosition = string.Empty;
string LastObjectRegionName = 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); resolveNamePositionRegionName(objectID, out LastObjectName, out LastObjectPosition, out LastObjectRegionName);
@ -310,7 +307,6 @@ namespace OpenSim.Region.CoreModules.Scripting.EmailModules
catch (Exception e) catch (Exception e)
{ {
m_log.Error("[EMAIL] DefaultEmailModule Exception: " + e.Message); m_log.Error("[EMAIL] DefaultEmailModule Exception: " + e.Message);
return;
} }
} }
else else
@ -324,7 +320,8 @@ namespace OpenSim.Region.CoreModules.Scripting.EmailModules
"\nRegion: " + LastObjectRegionName + "\nLocal-Position: " + "\nRegion: " + LastObjectRegionName + "\nLocal-Position: " +
LastObjectPosition + "\n\n" + body; 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 if (IsLocal(toID)) // TODO FIX check to see if it is local
{ {
@ -337,6 +334,10 @@ namespace OpenSim.Region.CoreModules.Scripting.EmailModules
// TODO FIX // TODO FIX
} }
} }
//DONE: Message as Second Life style
//20 second delay - AntiSpam System - for now only 10 seconds
DelayInSeconds(10);
} }
/// <summary> /// <summary>