aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/YEngine
diff options
context:
space:
mode:
authorUbitUmarov2019-10-16 00:08:45 +0100
committerUbitUmarov2019-10-16 00:08:45 +0100
commitd79d7e228a059e40a9334c9e2ec4c81075443f83 (patch)
tree14e2d3ef3e7515f1e285cdd3ef66925ccd6039b0 /OpenSim/Region/ScriptEngine/YEngine
parentchange coments on osslEnable.ini and remove list of functions always suported; (diff)
downloadopensim-SC-d79d7e228a059e40a9334c9e2ec4c81075443f83.zip
opensim-SC-d79d7e228a059e40a9334c9e2ec4c81075443f83.tar.gz
opensim-SC-d79d7e228a059e40a9334c9e2ec4c81075443f83.tar.bz2
opensim-SC-d79d7e228a059e40a9334c9e2ec4c81075443f83.tar.xz
add OSSL option PermissionErrortoOwner (true or false). if true ossl functions permission errors will only be sent to prim owner, defaul false: send all around
Diffstat (limited to 'OpenSim/Region/ScriptEngine/YEngine')
-rw-r--r--OpenSim/Region/ScriptEngine/YEngine/XMRInstRun.cs24
1 files changed, 20 insertions, 4 deletions
diff --git a/OpenSim/Region/ScriptEngine/YEngine/XMRInstRun.cs b/OpenSim/Region/ScriptEngine/YEngine/XMRInstRun.cs
index 987e22c..30e397b 100644
--- a/OpenSim/Region/ScriptEngine/YEngine/XMRInstRun.cs
+++ b/OpenSim/Region/ScriptEngine/YEngine/XMRInstRun.cs
@@ -539,10 +539,18 @@ namespace OpenSim.Region.ScriptEngine.Yengine
539 private void SendScriptErrorMessage(Exception e, ScriptEventCode ev) 539 private void SendScriptErrorMessage(Exception e, ScriptEventCode ev)
540 { 540 {
541 StringBuilder msg = new StringBuilder(); 541 StringBuilder msg = new StringBuilder();
542 542 bool toowner = false;
543 msg.Append("YEngine: "); 543 msg.Append("YEngine: ");
544 if (e.Message != null) 544 if (e.Message != null)
545 msg.Append(e.Message); 545 {
546 string text = e.Message;
547 if (text.StartsWith("(OWNER)"))
548 {
549 text = text.Substring(7);
550 toowner = true;
551 }
552 msg.Append(text);
553 }
546 554
547 msg.Append(" (script: "); 555 msg.Append(" (script: ");
548 msg.Append(m_Item.Name); 556 msg.Append(m_Item.Name);
@@ -563,8 +571,16 @@ namespace OpenSim.Region.ScriptEngine.Yengine
563 if (msgst.Length > 1000) 571 if (msgst.Length > 1000)
564 msgst = msgst.Substring(0, 1000); 572 msgst = msgst.Substring(0, 1000);
565 573
566 m_Engine.World.SimChat(Utils.StringToBytes(msgst), 574 if (toowner)
567 ChatTypeEnum.DebugChannel, 2147483647, 575 {
576 ScenePresence sp = m_Engine.World.GetScenePresence(m_Part.OwnerID);
577 if (sp != null && !sp.IsNPC)
578 m_Engine.World.SimChatToAgent(m_Part.OwnerID, Utils.StringToBytes(msgst), 0x7FFFFFFF, m_Part.AbsolutePosition,
579 m_Part.Name, m_Part.UUID, false);
580 }
581 else
582 m_Engine.World.SimChat(Utils.StringToBytes(msgst),
583 ChatTypeEnum.DebugChannel, 0x7FFFFFFF,
568 m_Part.AbsolutePosition, 584 m_Part.AbsolutePosition,
569 m_Part.Name, m_Part.UUID, false); 585 m_Part.Name, m_Part.UUID, false);
570 m_log.Debug(string.Format( 586 m_log.Debug(string.Format(