OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Allow OSSL scripts to softfail

melanie
Melanie Thielker 2017-01-07 22:53:46 +00:00
parent e2167716aa
commit e5244fe708
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
View File

@ -431,7 +431,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
ScenePresence sp = World.GetScenePresence(ownerID); ScenePresence sp = World.GetScenePresence(ownerID);
if (sp != null && !sp.IsDeleted && sp.IsGod) if (sp != null && !sp.IsDeleted && sp.IsGod)
{ {
return String.Empty; return "Softfail";
} }
} }

3
OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
View File

@ -927,6 +927,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
if(e.InnerException != null && e.InnerException is ScriptException) if(e.InnerException != null && e.InnerException is ScriptException)
{ {
if (e.InnerException.Message == "Softfail")
return;
string text = e.InnerException.Message + string text = e.InnerException.Message +
"(script: " + ScriptName + "(script: " + ScriptName +
" event: " + data.EventName + " event: " + data.EventName +