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;
} }
} }

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

@ -927,28 +927,25 @@ 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 +
{ "(script: " + ScriptName +
string text = e.InnerException.Message + " event: " + data.EventName +
"(script: " + ScriptName + " at " + Part.AbsolutePosition + ")";
" event: " + data.EventName + if (text.Length > 1000)
" at " + Part.AbsolutePosition + ")"; text = text.Substring(0, 1000);
if (text.Length > 1000) Engine.World.SimChat(Utils.StringToBytes(text),
text = text.Substring(0, 1000); ChatTypeEnum.DebugChannel, 2147483647,
Engine.World.SimChat(Utils.StringToBytes(text), Part.AbsolutePosition,
ChatTypeEnum.DebugChannel, 2147483647, Part.Name, Part.UUID, false);
Part.AbsolutePosition, m_log.Debug(string.Format(
Part.Name, Part.UUID, false); "[SCRIPT INSTANCE]: {0} (at event {1}, part {2} {3} at {4} in {5}",
m_log.Debug(string.Format( e.InnerException.Message,
"[SCRIPT INSTANCE]: {0} (at event {1}, part {2} {3} at {4} in {5}", data.EventName,
e.InnerException.Message, PrimName,
data.EventName, Part.UUID,
PrimName, Part.AbsolutePosition,
Part.UUID, Part.ParentGroup.Scene.Name));
Part.AbsolutePosition,
Part.ParentGroup.Scene.Name));
}
} }
else else
{ {