diff options
author | Melanie Thielker | 2009-02-14 21:25:22 +0000 |
---|---|---|
committer | Melanie Thielker | 2009-02-14 21:25:22 +0000 |
commit | 4bc52888be74b720431df2fbe3409c6e11a3029f (patch) | |
tree | f4674616768deff7134b33a61e9ca74ce915b132 /OpenSim/Region/ScriptEngine | |
parent | Remove the "?" that I inadvertently got into the first line (diff) | |
download | opensim-SC-4bc52888be74b720431df2fbe3409c6e11a3029f.zip opensim-SC-4bc52888be74b720431df2fbe3409c6e11a3029f.tar.gz opensim-SC-4bc52888be74b720431df2fbe3409c6e11a3029f.tar.bz2 opensim-SC-4bc52888be74b720431df2fbe3409c6e11a3029f.tar.xz |
Thank you, DoranZemlja, for a patch that implements local inter-object email
delivery.
Leaving Mantis #3145 open so that more code can be added.
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index ed9d3ee..9f5d143 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -2702,7 +2702,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
2702 | m_host.AddScriptLPS(1); | 2702 | m_host.AddScriptLPS(1); |
2703 | IEmailModule emailModule = m_ScriptEngine.World.RequestModuleInterface<IEmailModule>(); | 2703 | IEmailModule emailModule = m_ScriptEngine.World.RequestModuleInterface<IEmailModule>(); |
2704 | if (emailModule == null) | 2704 | if (emailModule == null) |
2705 | { | ||
2706 | ShoutError("llEmail: email module not configured"); | ||
2705 | return; | 2707 | return; |
2708 | } | ||
2706 | 2709 | ||
2707 | emailModule.SendEmail(m_host.UUID, address, subject, message); | 2710 | emailModule.SendEmail(m_host.UUID, address, subject, message); |
2708 | // ScriptSleep(20000); | 2711 | // ScriptSleep(20000); |
@@ -2713,7 +2716,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
2713 | m_host.AddScriptLPS(1); | 2716 | m_host.AddScriptLPS(1); |
2714 | IEmailModule emailModule = m_ScriptEngine.World.RequestModuleInterface<IEmailModule>(); | 2717 | IEmailModule emailModule = m_ScriptEngine.World.RequestModuleInterface<IEmailModule>(); |
2715 | if (emailModule == null) | 2718 | if (emailModule == null) |
2719 | { | ||
2720 | ShoutError("llGetNextEmail: email module not configured"); | ||
2716 | return; | 2721 | return; |
2722 | } | ||
2717 | Email email; | 2723 | Email email; |
2718 | 2724 | ||
2719 | email = emailModule.GetNextEmail(m_host.UUID, address, subject); | 2725 | email = emailModule.GetNextEmail(m_host.UUID, address, subject); |
@@ -3668,11 +3674,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
3668 | 3674 | ||
3669 | UUID partItemID; | 3675 | UUID partItemID; |
3670 | foreach (SceneObjectPart part in parts) | 3676 | foreach (SceneObjectPart part in parts) |
3677 | { | ||
3671 | foreach (TaskInventoryItem item in part.TaskInventory.Values) | 3678 | foreach (TaskInventoryItem item in part.TaskInventory.Values) |
3672 | { | 3679 | { |
3673 | if (item.Type == ScriptBaseClass.INVENTORY_SCRIPT) | 3680 | if (item.Type == ScriptBaseClass.INVENTORY_SCRIPT) |
3674 | { | 3681 | { |
3675 | |||
3676 | partItemID = item.ItemID; | 3682 | partItemID = item.ItemID; |
3677 | int linkNumber = m_host.LinkNum; | 3683 | int linkNumber = m_host.LinkNum; |
3678 | if (m_host.ParentGroup.Children.Count == 1) | 3684 | if (m_host.ParentGroup.Children.Count == 1) |
@@ -3689,6 +3695,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
3689 | resobj, new DetectParams[0])); | 3695 | resobj, new DetectParams[0])); |
3690 | } | 3696 | } |
3691 | } | 3697 | } |
3698 | } | ||
3692 | } | 3699 | } |
3693 | 3700 | ||
3694 | public void llPushObject(string target, LSL_Vector impulse, LSL_Vector ang_impulse, int local) | 3701 | public void llPushObject(string target, LSL_Vector impulse, LSL_Vector ang_impulse, int local) |