Revert "Allow OSSL scripts to softfail"
This reverts commit e5244fe708
.
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
melanie
parent
f457925f80
commit
556d95ef05
|
@ -440,7 +440,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
|
|||
ScenePresence sp = World.GetScenePresence(ownerID);
|
||||
if (sp != null && !sp.IsDeleted && sp.IsGod)
|
||||
{
|
||||
return "Softfail";
|
||||
return String.Empty;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -926,8 +926,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
|
|||
{
|
||||
|
||||
if(e.InnerException != null && e.InnerException is ScriptException)
|
||||
{
|
||||
if (e.InnerException.Message != "Softfail")
|
||||
{
|
||||
string text = e.InnerException.Message +
|
||||
"(script: " + ScriptName +
|
||||
|
@ -949,7 +947,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
|
|||
Part.ParentGroup.Scene.Name));
|
||||
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
|
|
Loading…
Reference in New Issue