aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs
diff options
context:
space:
mode:
authorUbitUmarov2018-07-18 22:19:46 +0100
committerUbitUmarov2018-07-18 22:19:46 +0100
commit8c1c9129aac75195ba32306c51e89ec6fc011de5 (patch)
treea9e6f85e62ad6874e17bff2a2852cfe81e9f282c /OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs
parenthttp reusecontext is obsolete (diff)
downloadopensim-SC-8c1c9129aac75195ba32306c51e89ec6fc011de5.zip
opensim-SC-8c1c9129aac75195ba32306c51e89ec6fc011de5.tar.gz
opensim-SC-8c1c9129aac75195ba32306c51e89ec6fc011de5.tar.bz2
opensim-SC-8c1c9129aac75195ba32306c51e89ec6fc011de5.tar.xz
mantis8341: fix MOD and LS apis configuration read from ossl file
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs7
1 files changed, 6 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs
index 238fefb..1979012 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs
@@ -61,6 +61,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
61 internal SceneObjectPart m_host; 61 internal SceneObjectPart m_host;
62 internal bool m_LSFunctionsEnabled = false; 62 internal bool m_LSFunctionsEnabled = false;
63 internal IScriptModuleComms m_comms = null; 63 internal IScriptModuleComms m_comms = null;
64 internal IConfig m_osslconfig;
64 65
65 public void Initialize( 66 public void Initialize(
66 IScriptEngine scriptEngine, SceneObjectPart host, TaskInventoryItem item) 67 IScriptEngine scriptEngine, SceneObjectPart host, TaskInventoryItem item)
@@ -68,7 +69,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
68 m_ScriptEngine = scriptEngine; 69 m_ScriptEngine = scriptEngine;
69 m_host = host; 70 m_host = host;
70 71
71 if (m_ScriptEngine.Config.GetBoolean("AllowLightShareFunctions", false)) 72 m_osslconfig = m_ScriptEngine.ConfigSource.Configs["OSSL"];
73 if(m_osslconfig == null)
74 m_osslconfig = m_ScriptEngine.Config;
75
76 if (m_osslconfig.GetBoolean("AllowLightShareFunctions", false))
72 m_LSFunctionsEnabled = true; 77 m_LSFunctionsEnabled = true;
73 78
74 m_comms = m_ScriptEngine.World.RequestModuleInterface<IScriptModuleComms>(); 79 m_comms = m_ScriptEngine.World.RequestModuleInterface<IScriptModuleComms>();