Allow OSSL scripts to softfail

2017-01-07 22:53:46 +00:00 · 2017-01-07 22:53:46 +00:00 · e5244fe708
parent e2167716aa
commit e5244fe708
2 changed files with 4 additions and 1 deletions
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@ -431,7 +431,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                        ScenePresence sp = World.GetScenePresence(ownerID);
                        if (sp != null && !sp.IsDeleted && sp.IsGod)
                        {
-                            return String.Empty;
+                            return "Softfail";
                        }
                    }

--- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
@ -927,6 +927,9 @@ 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 +