minor changes to last patch

This commit is contained in:
UbitUmarov
2018-08-30 14:51:07 +01:00
parent 99a23421a8
commit 9647a1e6c5
4 changed files with 11 additions and 11 deletions

View File

@@ -640,10 +640,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
dm.SendGeneralAlert(msg + "\n");
}
public void osRegionNotice(string agentID, string msg)
public void osRegionNotice(LSL_Key agentID, string msg)
{
CheckThreatLevel(ThreatLevel.High, "osRegionNotice");
if (!World.Permissions.CanIssueEstateCommand(m_host.OwnerID, false))
return;
IDialogModule dm = World.RequestModuleInterface<IDialogModule>();
if (dm == null)
return;
if (!UUID.TryParse(agentID, out UUID avatarID))
return;
@@ -653,13 +660,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
if (sp.IsChildAgent || sp.IsDeleted || sp.IsInTransit || sp.IsNPC)
return;
IDialogModule dm = World.RequestModuleInterface<IDialogModule>();
if (dm == null)
return;
if (!World.Permissions.CanIssueEstateCommand(m_host.OwnerID, false))
return;
dm.SendAlertToUser(sp.ControllingClient, msg + "\n", false);
}