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

minor changes to last patch

0.9.1.0-post-fixes
UbitUmarov 2018-08-30 14:51:07 +01:00
parent 99a23421a8
commit 9647a1e6c5
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
View File

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

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

@ -138,7 +138,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
int osRegionRestart(double seconds); int osRegionRestart(double seconds);
int osRegionRestart(double seconds, string msg); int osRegionRestart(double seconds, string msg);
void osRegionNotice(string msg); void osRegionNotice(string msg);
void osRegionNotice(string agentID, string msg); void osRegionNotice(LSL_Key agentID, string msg);
bool osConsoleCommand(string Command); bool osConsoleCommand(string Command);
void osSetParcelMediaURL(string url); void osSetParcelMediaURL(string url);
void osSetPrimFloatOnWater(int floatYN); void osSetPrimFloatOnWater(int floatYN);

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

@ -225,7 +225,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
m_OSSL_Functions.osRegionNotice(msg); m_OSSL_Functions.osRegionNotice(msg);
} }
public void osRegionNotice(string agentID, string msg) public void osRegionNotice(LSL_Key agentID, string msg)
{ {
m_OSSL_Functions.osRegionNotice(agentID, msg); m_OSSL_Functions.osRegionNotice(agentID, msg);
} }

2
bin/config-include/osslEnable.ini
View File

@ -182,6 +182,7 @@
Allow_osParcelJoin = ESTATE_MANAGER,ESTATE_OWNER Allow_osParcelJoin = ESTATE_MANAGER,ESTATE_OWNER
Allow_osParcelSubdivide = ESTATE_MANAGER,ESTATE_OWNER Allow_osParcelSubdivide = ESTATE_MANAGER,ESTATE_OWNER
Allow_osRegionRestart = ESTATE_MANAGER,ESTATE_OWNER Allow_osRegionRestart = ESTATE_MANAGER,ESTATE_OWNER
Allow_osRegionNotice = ESTATE_MANAGER,ESTATE_OWNER
Allow_osSetContentType = ${OSSL|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER Allow_osSetContentType = ${OSSL|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
Allow_osSetPrimitiveParams = false Allow_osSetPrimitiveParams = false
Allow_osSetProjectionParams = ${OSSL|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER Allow_osSetProjectionParams = ${OSSL|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
@ -206,7 +207,6 @@
Allow_osGetNotecard = ${OSSL|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER Allow_osGetNotecard = ${OSSL|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
Allow_osGetNotecardLine = ${OSSL|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER Allow_osGetNotecardLine = ${OSSL|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
Allow_osGetNumberOfNotecardLines = ${OSSL|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER Allow_osGetNumberOfNotecardLines = ${OSSL|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
Allow_osRegionNotice = ESTATE_MANAGER,ESTATE_OWNER
Allow_osSetRot = false Allow_osSetRot = false
Allow_osSetParcelDetails = ${OSSL|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER Allow_osSetParcelDetails = ${OSSL|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER