1 files changed, 11 insertions, 0 deletions

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index 544dce4..a8c1a8f 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -274,6 +274,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         //     or a string explaining why this function can't be used.
         private string CheckThreatLevelTest(ThreatLevel level, string function)
         {
+            // Grid gods can do anything they damn well please.
+            if (World.Permissions.IsGridGod(m_item.OwnerID))
+                return String.Empty;
+            else
+            {
+                // So can active gods.
+                ScenePresence sp = World.GetScenePresence(m_item.OwnerID);
+                if (sp != null && !sp.IsDeleted && sp.IsGod)
+                    return String.Empty;
+            }
+
             if (!m_FunctionPerms.ContainsKey(function))
             {
                 FunctionPerms perms = new FunctionPerms();