From 5139160ce4fd0f2abfa2ca2b26bbcfcb884fe2ce Mon Sep 17 00:00:00 2001 From: Melanie Thielker Date: Sat, 6 Jun 2009 16:39:28 +0000 Subject: Correct an error where the config file name was always considered to be a local file. This caused llHttpRequest and llSetInventoryPermsMask to fail on regions that load their config from a web server --- OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'OpenSim/Region/ScriptEngine/XEngine/XEngine.cs') diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs index 34f8145..4ab564b 100644 --- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs +++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs @@ -60,6 +60,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine private int m_MaxScriptQueue; private Scene m_Scene; private IConfig m_ScriptConfig = null; + private IConfigSource m_ConfigSource = null; private ICompiler m_Compiler; private int m_MinThreads; private int m_MaxThreads ; @@ -148,6 +149,11 @@ namespace OpenSim.Region.ScriptEngine.XEngine get { return m_ScriptConfig; } } + public IConfigSource ConfigSource + { + get { return m_ConfigSource; } + } + public event ScriptRemoved OnScriptRemoved; public event ObjectRemoved OnObjectRemoved; @@ -160,6 +166,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine return; m_ScriptConfig = configSource.Configs["XEngine"]; + m_ConfigSource = configSource; } public void AddRegion(Scene scene) -- cgit v1.1