LessOhSilly threat level nonsense.

1 files changed, 6 insertions, 11 deletions

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index 8ca8344..5bf6990 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -464,6 +464,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
             AllowedControlFlags functionControl = perms.AllowedControl;
 
+            if (functionControl == AllowedControlFlags.ALL)
+                return String.Empty;
+
+            if (functionControl == 0)
+                return String.Format("{0} disabled in region configuration", function);
+
             if (functionControl == AllowedControlFlags.THREATLEVEL)
             {
                 // Allow / disallow by threat level
@@ -474,13 +480,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                             "{0} permission denied.  Allowed threat level is {1} but function threat level is {2}.",
                             function, m_MaxThreatLevel, level);
             }
-
-            if (functionControl == 0)
-                return String.Format("{0} disabled in region configuration", function);
-
-            if (functionControl == AllowedControlFlags.ALL)
-                return String.Empty;
-
             if (((functionControl & AllowedControlFlags.OWNERUUID) != 0) && perms.AllowedOwners.Contains(m_host.OwnerID))
             {
                 // prim owner is in the list of allowed owners
@@ -2248,8 +2247,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         /// Instead of using the LSL Dataserver event to pull notecard data line by line,
         /// this will simply read the entire notecard and return its data as a string.
         ///
-        /// Warning - due to the synchronous method this function uses to fetch assets, its use
-        ///            may be dangerous and unreliable while running in grid mode.
         /// </remarks>
         /// <param name="name">Name of the notecard or its asset id</param>
         /// <returns>Notecard text</returns>
@@ -2275,8 +2272,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         /// Instead of using the LSL Dataserver event to pull notecard data,
         /// this will simply read the number of note card lines and return this data as an integer.
         ///
-        /// Warning - due to the synchronous method this function uses to fetch assets, its use
-        ///            may be dangerous and unreliable while running in grid mode.
         /// </remarks>
         /// <param name="name">Name of the notecard or its asset id</param>
         /// <returns></returns>