OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

remove a ossl dev only option

0.9.1.0-post-fixes
UbitUmarov 2018-11-26 18:35:45 +00:00
parent 87acd20d95
commit 911ef0ce52
1 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
View File

@ -141,7 +141,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
internal ThreatLevel m_MaxThreatLevel = ThreatLevel.VeryLow; internal ThreatLevel m_MaxThreatLevel = ThreatLevel.VeryLow;
internal float m_ScriptDelayFactor = 1.0f; internal float m_ScriptDelayFactor = 1.0f;
internal float m_ScriptDistanceFactor = 1.0f; internal float m_ScriptDistanceFactor = 1.0f;
internal bool m_debuggerSafe = false;
internal Dictionary<string, FunctionPerms > m_FunctionPerms = new Dictionary<string, FunctionPerms >(); internal Dictionary<string, FunctionPerms > m_FunctionPerms = new Dictionary<string, FunctionPerms >();
protected IUrlModule m_UrlModule = null; protected IUrlModule m_UrlModule = null;
protected ISoundModule m_SoundModule = null; protected ISoundModule m_SoundModule = null;
@ -158,8 +157,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
if(m_osslconfig == null) if(m_osslconfig == null)
m_osslconfig = m_ScriptEngine.Config; m_osslconfig = m_ScriptEngine.Config;
m_debuggerSafe = m_osslconfig.GetBoolean("DebuggerSafe", m_debuggerSafe);
m_UrlModule = m_ScriptEngine.World.RequestModuleInterface<IUrlModule>(); m_UrlModule = m_ScriptEngine.World.RequestModuleInterface<IUrlModule>();
m_SoundModule = m_ScriptEngine.World.RequestModuleInterface<ISoundModule>(); m_SoundModule = m_ScriptEngine.World.RequestModuleInterface<ISoundModule>();
@ -225,16 +222,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
} }
internal void OSSLError(string msg) internal void OSSLError(string msg)
{
if (m_debuggerSafe)
{
OSSLShoutError(msg);
}
else
{ {
throw new ScriptException("OSSL Runtime Error: " + msg); throw new ScriptException("OSSL Runtime Error: " + msg);
} }
}
/// <summary> /// <summary>
/// Initialize the LSL interface. /// Initialize the LSL interface.