replace the (hidden) GRID_GOD by a more usefull GOD so includes all types. This needs to be changed to current effective godlevel check (sp.GodLevel) when that is fixed. Automatic god powers need be (optionaly) removed

2 files changed, 6 insertions, 3 deletions

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index 5638f01..6e66479 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -310,7 +310,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                         foreach (string id in ids)
                         {
                             string current = id.Trim();
-                            if (current.ToUpper() == "PARCEL_GROUP_MEMBER" || current.ToUpper() == "PARCEL_OWNER" || current.ToUpper() == "ESTATE_MANAGER" || current.ToUpper() == "ESTATE_OWNER" || current.ToUpper() == "GRID_GOD")
+                            if (current.ToUpper() == "PARCEL_GROUP_MEMBER" || current.ToUpper() == "PARCEL_OWNER" || current.ToUpper() == "ESTATE_MANAGER" || current.ToUpper() == "ESTATE_OWNER" || current.ToUpper() == "GOD")
                             {
                                 if (!perms.AllowedOwnerClasses.Contains(current))
                                     perms.AllowedOwnerClasses.Add(current.ToUpper());
@@ -416,9 +416,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                     }
 
                     //Only gods may use the function
-                    if (m_FunctionPerms[function].AllowedOwnerClasses.Contains("GRID_GOD"))
+                    if (m_FunctionPerms[function].AllowedOwnerClasses.Contains("GOD"))
                     {
-                        if (World.Permissions.IsGridGod(ownerID))
+                        // this should be replaced by sp.GodLevel > 200 to be effective requested power
+                        // but that still needs fix
+                        if (World.Permissions.IsGod(ownerID)) 
                         {
                             return String.Empty;
                         }
diff --git a/bin/config-include/osslEnable.ini b/bin/config-include/osslEnable.ini
index a064f09..21e1451 100644
--- a/bin/config-include/osslEnable.ini
+++ b/bin/config-include/osslEnable.ini
@@ -37,6 +37,7 @@
   ; To enable for individuals or groups, set it to a comma separated list. This checks
   ;    against the owner of the object containing the script.
   ;    The comma separated entries in the list may be one of:
+  ;           "GOD" -- enable for users with GOD rights
   ;           "ESTATE_MANAGER" -- enable for estate manager
   ;           "ESTATE_OWNER" -- enable for estate owner
   ;           "PARCEL_OWNER" -- enable for parcel owner