From f34ad07e270ee8ef3762e67d5583246b49474007 Mon Sep 17 00:00:00 2001 From: onefang Date: Fri, 27 Aug 2021 01:59:28 +1000 Subject: Bring back DebuggerSafe, default to true. --- OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 4 ++-- OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 628ab54..fb20e58 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs @@ -122,7 +122,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api protected int m_notecardLineReadCharsMax = 255; protected int m_scriptConsoleChannel = 0; protected bool m_scriptConsoleChannelEnabled = false; - protected bool m_debuggerSafe = false; + public bool m_debuggerSafe = true; protected IUrlModule m_UrlModule = null; protected IMaterialsModule m_materialsModule = null; @@ -243,7 +243,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api m_ScriptEngine = scriptEngine; m_host = host; m_item = item; - m_debuggerSafe = m_ScriptEngine.Config.GetBoolean("DebuggerSafe", false); + m_debuggerSafe = m_ScriptEngine.Config.GetBoolean("DebuggerSafe", true); LoadConfig(); diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index 73b15af..362c8c8 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs @@ -264,9 +264,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api internal void OSSLError(string msg) { -// if (m_debuggerSafe) -// OSSLShoutError(msg); -// else + if (m_LSL_Api.m_debuggerSafe) + OSSLShoutError(msg); + else { throw new ScriptException("OSSL Runtime Error: " + msg); } -- cgit v1.1