aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared
diff options
context:
space:
mode:
authorUbitUmarov2018-10-20 16:21:36 +0100
committerUbitUmarov2018-10-20 16:21:36 +0100
commit56d5b3bf92dbae94b608965c3c1d212a803e7fc7 (patch)
treeead7f5716285b52a685249563f811f7bc835ee61 /OpenSim/Region/ScriptEngine/Shared
parentchange ossl tests setup (diff)
downloadopensim-SC-56d5b3bf92dbae94b608965c3c1d212a803e7fc7.zip
opensim-SC-56d5b3bf92dbae94b608965c3c1d212a803e7fc7.tar.gz
opensim-SC-56d5b3bf92dbae94b608965c3c1d212a803e7fc7.tar.bz2
opensim-SC-56d5b3bf92dbae94b608965c3c1d212a803e7fc7.tar.xz
oops
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiAttachmentTests.cs3
2 files changed, 1 insertions, 4 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index 5e13592..1e0d2e5 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -158,7 +158,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
158 if(m_osslconfig == null) 158 if(m_osslconfig == null)
159 m_osslconfig = m_ScriptEngine.Config; 159 m_osslconfig = m_ScriptEngine.Config;
160 160
161 m_debuggerSafe = m_ScriptEngine.Config.GetBoolean("DebuggerSafe", m_debuggerSafe); 161 m_debuggerSafe = m_osslconfig.GetBoolean("DebuggerSafe", m_debuggerSafe);
162 162
163 m_UrlModule = m_ScriptEngine.World.RequestModuleInterface<IUrlModule>(); 163 m_UrlModule = m_ScriptEngine.World.RequestModuleInterface<IUrlModule>();
164 m_SoundModule = m_ScriptEngine.World.RequestModuleInterface<ISoundModule>(); 164 m_SoundModule = m_ScriptEngine.World.RequestModuleInterface<ISoundModule>();
diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiAttachmentTests.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiAttachmentTests.cs
index 4c7d0bb..c7fdefc 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiAttachmentTests.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiAttachmentTests.cs
@@ -68,12 +68,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
68 68
69 IConfig xengineConfig = initConfigSource.AddConfig("XEngine"); 69 IConfig xengineConfig = initConfigSource.AddConfig("XEngine");
70 xengineConfig.Set("Enabled", "true"); 70 xengineConfig.Set("Enabled", "true");
71 xengineConfig.Set("AllowOSFunctions", "true");
72 xengineConfig.Set("OSFunctionThreatLevel", "Severe");
73 71
74 IConfig oconfig = initConfigSource.AddConfig("OSSL"); 72 IConfig oconfig = initConfigSource.AddConfig("OSSL");
75 oconfig.Set("DebuggerSafe", false); 73 oconfig.Set("DebuggerSafe", false);
76 oconfig.Set("Enabled", "true");
77 oconfig.Set("AllowOSFunctions", "true"); 74 oconfig.Set("AllowOSFunctions", "true");
78 oconfig.Set("OSFunctionThreatLevel", "Severe"); 75 oconfig.Set("OSFunctionThreatLevel", "Severe");
79 76