aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
diff options
context:
space:
mode:
authorMelanie Thielker2017-01-07 22:53:46 +0000
committerMelanie Thielker2017-01-07 22:53:46 +0000
commite5244fe70830d6c9ece23d26039d5cbabe9ce9ff (patch)
treeba8d9ed232e674f5b29882ea4c20e2b7fbbe9d8e /OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
parentchange OSSL enable option GOD to use IsGod, so it means a active god, as my o... (diff)
downloadopensim-SC-e5244fe70830d6c9ece23d26039d5cbabe9ce9ff.zip
opensim-SC-e5244fe70830d6c9ece23d26039d5cbabe9ce9ff.tar.gz
opensim-SC-e5244fe70830d6c9ece23d26039d5cbabe9ce9ff.tar.bz2
opensim-SC-e5244fe70830d6c9ece23d26039d5cbabe9ce9ff.tar.xz
Allow OSSL scripts to softfail
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs3
1 files changed, 3 insertions, 0 deletions
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
927 927
928 if(e.InnerException != null && e.InnerException is ScriptException) 928 if(e.InnerException != null && e.InnerException is ScriptException)
929 { 929 {
930 if (e.InnerException.Message == "Softfail")
931 return;
932
930 string text = e.InnerException.Message + 933 string text = e.InnerException.Message +
931 "(script: " + ScriptName + 934 "(script: " + ScriptName +
932 " event: " + data.EventName + 935 " event: " + data.EventName +