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

Revert "Allow OSSL scripts to softfail" 

This reverts commit e5244fe708.

Conflicts:
	OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
melanie
Melanie Thielker 2017-01-07 23:36:07 +00:00
parent f457925f80
commit 556d95ef05
2 changed files with 19 additions and 22 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

@ -440,7 +440,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 "Softfail"; return String.Empty;
} }
} }

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

@ -926,8 +926,6 @@ 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")
{ {
string text = e.InnerException.Message + string text = e.InnerException.Message +
"(script: " + ScriptName + "(script: " + ScriptName +
@ -949,7 +947,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
Part.ParentGroup.Scene.Name)); Part.ParentGroup.Scene.Name));
} }
}
else else
{ {