From e5244fe70830d6c9ece23d26039d5cbabe9ce9ff Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Sat, 7 Jan 2017 22:53:46 +0000
Subject: Allow OSSL scripts to softfail

---
 OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'OpenSim/Region/ScriptEngine/Shared/Instance')

diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
index 9d72b1c..f4ea5e9 100644
--- 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 +
-- 
cgit v1.1