ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-01 06:06:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

several changes to llTargetedEmail

Browse Source
This commit is contained in:
UbitUmarov
2020-08-08 17:37:48 +01:00
parent d022891cc1
commit baf94f1af5
4 changed files with 59 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

88
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
View File

@@ -129,6 +129,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
protected IMaterialsModule m_materialsModule = null;
protected IEnvironmentModule m_envModule = null;
protected IEmailModule m_emailModule = null;
protected Dictionary<UUID, UserInfoCacheEntry> m_userInfoCache = new Dictionary<UUID, UserInfoCacheEntry>();
protected int EMAIL_PAUSE_TIME = 20; // documented delay value for smtp.
@@ -147,7 +148,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
protected int m_sleepMsOnMakeFire = 100;
protected int m_sleepMsOnRezAtRoot = 100;
protected int m_sleepMsOnInstantMessage = 2000;
protected int m_sleepMsOnEmail = 20000;
protected int m_sleepMsOnEmail = 30000;
protected int m_sleepMsOnCreateLink = 1000;
protected int m_sleepMsOnGiveInventory = 3000;
protected int m_sleepMsOnRequestAgentData = 100;
@@ -314,6 +315,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
m_SoundModule = m_ScriptEngine.World.RequestModuleInterface<ISoundModule>();
m_materialsModule = m_ScriptEngine.World.RequestModuleInterface<IMaterialsModule>();
m_emailModule = m_ScriptEngine.World.RequestModuleInterface<IEmailModule>();
m_envModule = m_ScriptEngine.World.RequestModuleInterface< IEnvironmentModule>();
AsyncCommands = new AsyncCommandManager(m_ScriptEngine);
@@ -3983,8 +3985,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
public void llEmail(string address, string subject, string message)
{
m_host.AddScriptLPS(1);
IEmailModule emailModule = m_ScriptEngine.World.RequestModuleInterface<IEmailModule>();
if (emailModule == null)
if (m_emailModule == null)
{
Error("llEmail", "Email module not configured");
return;
@@ -4014,22 +4015,21 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
address = account.Email;
}
emailModule.SendEmail(m_host.UUID, address, subject, message);
m_emailModule.SendEmail(m_host.UUID, address, subject, message);
ScriptSleep(m_sleepMsOnEmail);
}
public void llGetNextEmail(string address, string subject)
{
m_host.AddScriptLPS(1);
IEmailModule emailModule = m_ScriptEngine.World.RequestModuleInterface<IEmailModule>();
if (emailModule == null)
if (m_emailModule == null)
{
Error("llGetNextEmail", "Email module not configured");
return;
}
Email email;
email = emailModule.GetNextEmail(m_host.UUID, address, subject);
email = m_emailModule.GetNextEmail(m_host.UUID, address, subject);
if (email == null)
return;
@@ -4046,42 +4046,64 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
}
public void llTargetedEmail(LSL_Integer target, string subject, string message)
public void llTargetedEmail(LSL_Integer target, LSL_String subject, LSL_String message)
{
m_host.AddScriptLPS(1);
IEmailModule emailModule = m_ScriptEngine.World.RequestModuleInterface<IEmailModule>();
if (emailModule == null)
SceneObjectGroup parent = m_host.ParentGroup;
if (parent == null || parent.IsDeleted)
return;
if (m_emailModule == null)
{
Error("llTargetedEmail", "Email module not configured");
return;
}
string address;
if(target == ScriptBaseClass.TARGETED_EMAIL_OBJECT_OWNER)
if (subject.Length + message.Length > 4096)
{
UserAccount account =
World.UserAccountService.GetUserAccount(
World.RegionInfo.ScopeID,
m_host.OwnerID);
if (account == null)
{
Error("llEmail", "Can't find user account for '" + m_host.OwnerID.ToString() + "'");
return;
}
if (String.IsNullOrEmpty(account.Email))
{
Error("llEmail", "User account has not registered an email address.");
return;
}
address = account.Email;
Error("llTargetedEmail", "Message is too large");
return;
}
else return;
emailModule.SendEmail(m_host.UUID, address, subject, message);
string address;
UserAccount account = null;
if (target == ScriptBaseClass.TARGETED_EMAIL_OBJECT_OWNER)
{
if(parent.OwnerID == parent.GroupID)
return;
account = World.UserAccountService.GetUserAccount(
World.RegionInfo.ScopeID,
parent.OwnerID);
}
else if (target == ScriptBaseClass.TARGETED_EMAIL_ROOT_CREATOR)
{
// non standard avoid creator spam
if(((parent.RootPart.OwnerMask & (uint)PermissionMask.Modify) == 0) || m_item.CreatorID == parent.RootPart.CreatorID)
{
account = World.UserAccountService.GetUserAccount(
World.RegionInfo.ScopeID,
parent.RootPart.CreatorID);
}
}
else
return;
if (account == null)
{
Error("llTargetedEmail", "Can't find user account for '" + m_host.OwnerID.ToString() + "'");
return;
}
address = account.Email;
if (String.IsNullOrEmpty(address))
{
Error("llTargetedEmail", "User account has not registered an email address.");
return;
}
m_emailModule.SendEmail(m_host.UUID, address, subject, message);
ScriptSleep(m_sleepMsOnEmail);
}

2
OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
View File

@@ -426,7 +426,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
LSL_Integer llTarget(LSL_Vector position, double range);
void llTargetOmega(LSL_Vector axis, double spinrate, double gain);
void llTargetRemove(int number);
void llTargetedEmail(LSL_Integer target, string subject, string message);
void llTargetedEmail(LSL_Integer target, LSL_String subject, LSL_String message);
void llTeleportAgentHome(string agent);
void llTeleportAgent(string agent, string simname, LSL_Vector pos, LSL_Vector lookAt);
void llTeleportAgentGlobalCoords(string agent, LSL_Vector global, LSL_Vector pos, LSL_Vector lookAt);

3
OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
View File

@@ -970,8 +970,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
public const string IMG_USE_BAKED_AUX1 = "9742065b-19b5-297c-858a-29711d539043";
public const string IMG_USE_BAKED_AUX2 = "03642e83-2bd1-4eb9-34b4-4c47ed586d2d";
public const string IMG_USE_BAKED_AUX3 = "edd51b77-fc10-ce7a-4b3d-011dfc349e4f";
// llTargetedEmail
public const int TARGETED_EMAIL_ROOT_CREATOR = 1;
public const int TARGETED_EMAIL_OBJECT_OWNER = 2;
}
}

2
OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
View File

@@ -1921,7 +1921,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
m_LSL_Functions.llTargetRemove(number);
}
public void llTargetedEmail(LSL_Integer target, string subject, string message)
public void llTargetedEmail(LSL_Integer target, LSL_String subject, LSL_String message)
{
m_LSL_Functions.llTargetedEmail(target, subject, message);
}