From 9647a1e6c56f375635cb550806dbcf5b9ca9738c Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Thu, 30 Aug 2018 14:51:07 +0100
Subject: minor changes to last patch

---
 .../ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs     | 14 +++++++-------
 .../Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs  |  2 +-
 .../Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs    |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'OpenSim/Region')

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
             dm.SendGeneralAlert(msg + "\n");
         }
 
-        public void osRegionNotice(string agentID, string msg)
+        public void osRegionNotice(LSL_Key agentID, string msg)
         {
             CheckThreatLevel(ThreatLevel.High, "osRegionNotice");
 
-            if (!UUID.TryParse(agentID, out UUID avatarID))
+            if (!World.Permissions.CanIssueEstateCommand(m_host.OwnerID, false))
                 return;
 
-            if (!World.TryGetScenePresence(avatarID, out ScenePresence sp))
+            IDialogModule dm = World.RequestModuleInterface<IDialogModule>();
+            if (dm == null)
                 return;
 
-            if (sp.IsChildAgent || sp.IsDeleted || sp.IsInTransit || sp.IsNPC)
+            if (!UUID.TryParse(agentID, out UUID avatarID))
                 return;
 
-            IDialogModule dm = World.RequestModuleInterface<IDialogModule>();
-            if (dm == null)
+            if (!World.TryGetScenePresence(avatarID, out ScenePresence sp))
                 return;
 
-            if (!World.Permissions.CanIssueEstateCommand(m_host.OwnerID, false))
+            if (sp.IsChildAgent || sp.IsDeleted || sp.IsInTransit || sp.IsNPC)
                 return;
 
             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
         int osRegionRestart(double seconds);
         int osRegionRestart(double seconds, string msg);
         void osRegionNotice(string msg);
-        void osRegionNotice(string agentID, string msg);
+        void osRegionNotice(LSL_Key agentID, string msg);
         bool osConsoleCommand(string Command);
         void osSetParcelMediaURL(string url);
         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
             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);
         }
-- 
cgit v1.1