Fix a compile issue and reintroduce the "GOD" script option

2 files changed, 32 insertions, 23 deletions

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index bb475a2..5b783f7 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() == "ACTIVE_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" || current.ToUpper() == "GOD")
                             {
                                 if (!perms.AllowedOwnerClasses.Contains(current))
                                     perms.AllowedOwnerClasses.Add(current.ToUpper());
@@ -425,6 +425,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                         }
                     }
 
+                    //Any god may use the function
+                    if (m_FunctionPerms[function].AllowedOwnerClasses.Contains("GOD"))
+                    {
+                        if (World.Permissions.IsAdministrator(ownerID))
+                        {
+                            return String.Empty;
+                        }
+                    }
+
                     //Only active gods may use the function
                     if (m_FunctionPerms[function].AllowedOwnerClasses.Contains("ACTIVE_GOD"))
                     {
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
index f4ea5e9..de0a80d 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
@@ -927,28 +927,28 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
 
                                 if(e.InnerException != null && e.InnerException is ScriptException)
                                 {
-                                    if (e.InnerException.Message == "Softfail")
-                                        return;
-
-                                    string text = e.InnerException.Message +
-                                                "(script: " + ScriptName +
-                                                " event: " + data.EventName +
-                                                " at " + Part.AbsolutePosition + ")";
-                                    if (text.Length > 1000)
-                                        text = text.Substring(0, 1000);
-                                    Engine.World.SimChat(Utils.StringToBytes(text),
-                                                           ChatTypeEnum.DebugChannel, 2147483647,
-                                                           Part.AbsolutePosition,
-                                                           Part.Name, Part.UUID, false);
-                                    m_log.Debug(string.Format(
-                                        "[SCRIPT INSTANCE]: {0} (at event {1}, part {2} {3} at {4} in {5}",
-                                        e.InnerException.Message,
-                                        data.EventName,
-                                        PrimName,
-                                        Part.UUID,
-                                        Part.AbsolutePosition,
-                                        Part.ParentGroup.Scene.Name));
-
+                                    if (e.InnerException.Message != "Softfail")
+                                    {
+                                        string text = e.InnerException.Message +
+                                                    "(script: " + ScriptName +
+                                                    " event: " + data.EventName +
+                                                    " at " + Part.AbsolutePosition + ")";
+                                        if (text.Length > 1000)
+                                            text = text.Substring(0, 1000);
+                                        Engine.World.SimChat(Utils.StringToBytes(text),
+                                                               ChatTypeEnum.DebugChannel, 2147483647,
+                                                               Part.AbsolutePosition,
+                                                               Part.Name, Part.UUID, false);
+                                        m_log.Debug(string.Format(
+                                            "[SCRIPT INSTANCE]: {0} (at event {1}, part {2} {3} at {4} in {5}",
+                                            e.InnerException.Message,
+                                            data.EventName,
+                                            PrimName,
+                                            Part.UUID,
+                                            Part.AbsolutePosition,
+                                            Part.ParentGroup.Scene.Name));
+
+                                    }
                                 }
                                 else
                                 {