From 8c1c9129aac75195ba32306c51e89ec6fc011de5 Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Wed, 18 Jul 2018 22:19:46 +0100
Subject: mantis8341: fix MOD and LS apis configuration read from ossl file
---
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs | 7 ++++++-
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/MOD_Api.cs | 8 +++++++-
2 files changed, 13 insertions(+), 2 deletions(-)
(limited to 'OpenSim')
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
internal SceneObjectPart m_host;
internal bool m_LSFunctionsEnabled = false;
internal IScriptModuleComms m_comms = null;
+ internal IConfig m_osslconfig;
public void Initialize(
IScriptEngine scriptEngine, SceneObjectPart host, TaskInventoryItem item)
@@ -68,7 +69,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
m_ScriptEngine = scriptEngine;
m_host = host;
- if (m_ScriptEngine.Config.GetBoolean("AllowLightShareFunctions", false))
+ m_osslconfig = m_ScriptEngine.ConfigSource.Configs["OSSL"];
+ if(m_osslconfig == null)
+ m_osslconfig = m_ScriptEngine.Config;
+
+ if (m_osslconfig.GetBoolean("AllowLightShareFunctions", false))
m_LSFunctionsEnabled = true;
m_comms = m_ScriptEngine.World.RequestModuleInterface<IScriptModuleComms>();
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/MOD_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/MOD_Api.cs
index 692bec0..b73a141 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/MOD_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/MOD_Api.cs
@@ -64,6 +64,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
internal TaskInventoryItem m_item;
internal bool m_MODFunctionsEnabled = false;
internal IScriptModuleComms m_comms = null;
+ internal IConfig m_osslconfig;
public void Initialize(
IScriptEngine scriptEngine, SceneObjectPart host, TaskInventoryItem item)
@@ -72,7 +73,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
m_host = host;
m_item = item;
- if (m_ScriptEngine.Config.GetBoolean("AllowMODFunctions", false))
+
+ m_osslconfig = m_ScriptEngine.ConfigSource.Configs["OSSL"];
+ if(m_osslconfig == null)
+ m_osslconfig = m_ScriptEngine.Config;
+
+ if (m_osslconfig.GetBoolean("AllowMODFunctions", false))
m_MODFunctionsEnabled = true;
m_comms = m_ScriptEngine.World.RequestModuleInterface<IScriptModuleComms>();
--
cgit v1.1