aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs14
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs2
3 files changed, 9 insertions, 9 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index b74490c..d2eecea 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -640,24 +640,24 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
640 dm.SendGeneralAlert(msg + "\n"); 640 dm.SendGeneralAlert(msg + "\n");
641 } 641 }
642 642
643 public void osRegionNotice(string agentID, string msg) 643 public void osRegionNotice(LSL_Key agentID, string msg)
644 { 644 {
645 CheckThreatLevel(ThreatLevel.High, "osRegionNotice"); 645 CheckThreatLevel(ThreatLevel.High, "osRegionNotice");
646 646
647 if (!UUID.TryParse(agentID, out UUID avatarID)) 647 if (!World.Permissions.CanIssueEstateCommand(m_host.OwnerID, false))
648 return; 648 return;
649 649
650 if (!World.TryGetScenePresence(avatarID, out ScenePresence sp)) 650 IDialogModule dm = World.RequestModuleInterface<IDialogModule>();
651 if (dm == null)
651 return; 652 return;
652 653
653 if (sp.IsChildAgent || sp.IsDeleted || sp.IsInTransit || sp.IsNPC) 654 if (!UUID.TryParse(agentID, out UUID avatarID))
654 return; 655 return;
655 656
656 IDialogModule dm = World.RequestModuleInterface<IDialogModule>(); 657 if (!World.TryGetScenePresence(avatarID, out ScenePresence sp))
657 if (dm == null)
658 return; 658 return;
659 659
660 if (!World.Permissions.CanIssueEstateCommand(m_host.OwnerID, false)) 660 if (sp.IsChildAgent || sp.IsDeleted || sp.IsInTransit || sp.IsNPC)
661 return; 661 return;
662 662
663 dm.SendAlertToUser(sp.ControllingClient, msg + "\n", false); 663 dm.SendAlertToUser(sp.ControllingClient, msg + "\n", false);
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
index 10478e8..9f35d7a 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
@@ -138,7 +138,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
138 int osRegionRestart(double seconds); 138 int osRegionRestart(double seconds);
139 int osRegionRestart(double seconds, string msg); 139 int osRegionRestart(double seconds, string msg);
140 void osRegionNotice(string msg); 140 void osRegionNotice(string msg);
141 void osRegionNotice(string agentID, string msg); 141 void osRegionNotice(LSL_Key agentID, string msg);
142 bool osConsoleCommand(string Command); 142 bool osConsoleCommand(string Command);
143 void osSetParcelMediaURL(string url); 143 void osSetParcelMediaURL(string url);
144 void osSetPrimFloatOnWater(int floatYN); 144 void osSetPrimFloatOnWater(int floatYN);
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
index 5f7841e..5c6d233 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
@@ -225,7 +225,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
225 m_OSSL_Functions.osRegionNotice(msg); 225 m_OSSL_Functions.osRegionNotice(msg);
226 } 226 }
227 227
228 public void osRegionNotice(string agentID, string msg) 228 public void osRegionNotice(LSL_Key agentID, string msg)
229 { 229 {
230 m_OSSL_Functions.osRegionNotice(agentID, msg); 230 m_OSSL_Functions.osRegionNotice(agentID, msg);
231 } 231 }