diff options
author | onefang | 2021-08-27 01:59:28 +1000 |
---|---|---|
committer | onefang | 2021-08-27 01:59:28 +1000 |
commit | f34ad07e270ee8ef3762e67d5583246b49474007 (patch) | |
tree | 722982bcd8026e16f73e2b5ec1f9cd37d4b939c3 /OpenSim/Region | |
parent | Properly use ScriptBaseClass.DEBUG_CHANNEL. (diff) | |
download | opensim-SC-f34ad07e270ee8ef3762e67d5583246b49474007.zip opensim-SC-f34ad07e270ee8ef3762e67d5583246b49474007.tar.gz opensim-SC-f34ad07e270ee8ef3762e67d5583246b49474007.tar.bz2 opensim-SC-f34ad07e270ee8ef3762e67d5583246b49474007.tar.xz |
Bring back DebuggerSafe, default to true.
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 4 | ||||
-rw-r--r-- | 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 | |||
122 | protected int m_notecardLineReadCharsMax = 255; | 122 | protected int m_notecardLineReadCharsMax = 255; |
123 | protected int m_scriptConsoleChannel = 0; | 123 | protected int m_scriptConsoleChannel = 0; |
124 | protected bool m_scriptConsoleChannelEnabled = false; | 124 | protected bool m_scriptConsoleChannelEnabled = false; |
125 | protected bool m_debuggerSafe = false; | 125 | public bool m_debuggerSafe = true; |
126 | protected IUrlModule m_UrlModule = null; | 126 | protected IUrlModule m_UrlModule = null; |
127 | 127 | ||
128 | protected IMaterialsModule m_materialsModule = null; | 128 | protected IMaterialsModule m_materialsModule = null; |
@@ -243,7 +243,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
243 | m_ScriptEngine = scriptEngine; | 243 | m_ScriptEngine = scriptEngine; |
244 | m_host = host; | 244 | m_host = host; |
245 | m_item = item; | 245 | m_item = item; |
246 | m_debuggerSafe = m_ScriptEngine.Config.GetBoolean("DebuggerSafe", false); | 246 | m_debuggerSafe = m_ScriptEngine.Config.GetBoolean("DebuggerSafe", true); |
247 | 247 | ||
248 | LoadConfig(); | 248 | LoadConfig(); |
249 | 249 | ||
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 | |||
264 | 264 | ||
265 | internal void OSSLError(string msg) | 265 | internal void OSSLError(string msg) |
266 | { | 266 | { |
267 | // if (m_debuggerSafe) | 267 | if (m_LSL_Api.m_debuggerSafe) |
268 | // OSSLShoutError(msg); | 268 | OSSLShoutError(msg); |
269 | // else | 269 | else |
270 | { | 270 | { |
271 | throw new ScriptException("OSSL Runtime Error: " + msg); | 271 | throw new ScriptException("OSSL Runtime Error: " + msg); |
272 | } | 272 | } |