2 files changed, 3 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 07549f8..f40bf20 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() == "GOD" || current.ToUpper() == "GRID_GOD")
+                            if (current.ToUpper() == "PARCEL_GROUP_MEMBER" || current.ToUpper() == "PARCEL_OWNER" || current.ToUpper() == "ESTATE_MANAGER" || current.ToUpper() == "ESTATE_OWNER" || current.ToUpper() == "ACTIVE_GOD" || current.ToUpper() == "GRID_GOD")
                             {
                                 if (!perms.AllowedOwnerClasses.Contains(current))
                                     perms.AllowedOwnerClasses.Add(current.ToUpper());
@@ -426,7 +426,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                     }
 
                     //Only active gods may use the function
-                    if (m_FunctionPerms[function].AllowedOwnerClasses.Contains("GOD"))
+                    if (m_FunctionPerms[function].AllowedOwnerClasses.Contains("ACTIVE_GOD"))
                     {
                         ScenePresence sp = World.GetScenePresence(ownerID);
                         if (sp != null && !sp.IsDeleted && sp.IsGod)
diff --git a/bin/config-include/osslEnable.ini b/bin/config-include/osslEnable.ini
index 3859ba6..7bdb7b5 100644
--- a/bin/config-include/osslEnable.ini
+++ b/bin/config-include/osslEnable.ini
@@ -38,7 +38,7 @@
   ;    against the owner of the object containing the script.
   ;    The comma separated entries in the list may be one of:
   ;           "GRID_GOD" -- enable for users with UserLevel >= 200
-  ;           "GOD" -- enable for present and with active god power
+  ;           "ACTIVE_GOD" -- enable for present and with active god power user
   ;           "ESTATE_MANAGER" -- enable for estate manager
   ;           "ESTATE_OWNER" -- enable for estate owner
   ;           "PARCEL_OWNER" -- enable for parcel owner