aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs7
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/MOD_Api.cs8
2 files changed, 13 insertions, 2 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>();
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
64 internal TaskInventoryItem m_item; 64 internal TaskInventoryItem m_item;
65 internal bool m_MODFunctionsEnabled = false; 65 internal bool m_MODFunctionsEnabled = false;
66 internal IScriptModuleComms m_comms = null; 66 internal IScriptModuleComms m_comms = null;
67 internal IConfig m_osslconfig;
67 68
68 public void Initialize( 69 public void Initialize(
69 IScriptEngine scriptEngine, SceneObjectPart host, TaskInventoryItem item) 70 IScriptEngine scriptEngine, SceneObjectPart host, TaskInventoryItem item)
@@ -72,7 +73,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
72 m_host = host; 73 m_host = host;
73 m_item = item; 74 m_item = item;
74 75
75 if (m_ScriptEngine.Config.GetBoolean("AllowMODFunctions", false)) 76
77 m_osslconfig = m_ScriptEngine.ConfigSource.Configs["OSSL"];
78 if(m_osslconfig == null)
79 m_osslconfig = m_ScriptEngine.Config;
80
81 if (m_osslconfig.GetBoolean("AllowMODFunctions", false))
76 m_MODFunctionsEnabled = true; 82 m_MODFunctionsEnabled = true;
77 83
78 m_comms = m_ScriptEngine.World.RequestModuleInterface<IScriptModuleComms>(); 84 m_comms = m_ScriptEngine.World.RequestModuleInterface<IScriptModuleComms>();