aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorUbitUmarov2018-11-26 18:35:45 +0000
committerUbitUmarov2018-11-26 18:35:45 +0000
commit911ef0ce52ec80b6629e14c7961005863dd02e05 (patch)
tree221f6e426c3273c71a8e4b1ac79c6f68e2e87f10 /OpenSim/Region
parentadd script constant OS_APIVERSION, we should inc this on any change on any ap... (diff)
downloadopensim-SC-911ef0ce52ec80b6629e14c7961005863dd02e05.zip
opensim-SC-911ef0ce52ec80b6629e14c7961005863dd02e05.tar.gz
opensim-SC-911ef0ce52ec80b6629e14c7961005863dd02e05.tar.bz2
opensim-SC-911ef0ce52ec80b6629e14c7961005863dd02e05.tar.xz
remove a ossl dev only option
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs12
1 files changed, 1 insertions, 11 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index 90352fa..0e3c97f 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -141,7 +141,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
141 internal ThreatLevel m_MaxThreatLevel = ThreatLevel.VeryLow; 141 internal ThreatLevel m_MaxThreatLevel = ThreatLevel.VeryLow;
142 internal float m_ScriptDelayFactor = 1.0f; 142 internal float m_ScriptDelayFactor = 1.0f;
143 internal float m_ScriptDistanceFactor = 1.0f; 143 internal float m_ScriptDistanceFactor = 1.0f;
144 internal bool m_debuggerSafe = false;
145 internal Dictionary<string, FunctionPerms > m_FunctionPerms = new Dictionary<string, FunctionPerms >(); 144 internal Dictionary<string, FunctionPerms > m_FunctionPerms = new Dictionary<string, FunctionPerms >();
146 protected IUrlModule m_UrlModule = null; 145 protected IUrlModule m_UrlModule = null;
147 protected ISoundModule m_SoundModule = null; 146 protected ISoundModule m_SoundModule = null;
@@ -158,8 +157,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
158 if(m_osslconfig == null) 157 if(m_osslconfig == null)
159 m_osslconfig = m_ScriptEngine.Config; 158 m_osslconfig = m_ScriptEngine.Config;
160 159
161 m_debuggerSafe = m_osslconfig.GetBoolean("DebuggerSafe", m_debuggerSafe);
162
163 m_UrlModule = m_ScriptEngine.World.RequestModuleInterface<IUrlModule>(); 160 m_UrlModule = m_ScriptEngine.World.RequestModuleInterface<IUrlModule>();
164 m_SoundModule = m_ScriptEngine.World.RequestModuleInterface<ISoundModule>(); 161 m_SoundModule = m_ScriptEngine.World.RequestModuleInterface<ISoundModule>();
165 162
@@ -226,14 +223,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
226 223
227 internal void OSSLError(string msg) 224 internal void OSSLError(string msg)
228 { 225 {
229 if (m_debuggerSafe) 226 throw new ScriptException("OSSL Runtime Error: " + msg);
230 {
231 OSSLShoutError(msg);
232 }
233 else
234 {
235 throw new ScriptException("OSSL Runtime Error: " + msg);
236 }
237 } 227 }
238 228
239 /// <summary> 229 /// <summary>