diff options
author | Melanie Thielker | 2009-06-06 16:39:28 +0000 |
---|---|---|
committer | Melanie Thielker | 2009-06-06 16:39:28 +0000 |
commit | 5139160ce4fd0f2abfa2ca2b26bbcfcb884fe2ce (patch) | |
tree | 94b815ca0a937b4c9ae05d206d8fb732d79876dc /OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | |
parent | some code cleanup (diff) | |
download | opensim-SC_OLD-5139160ce4fd0f2abfa2ca2b26bbcfcb884fe2ce.zip opensim-SC_OLD-5139160ce4fd0f2abfa2ca2b26bbcfcb884fe2ce.tar.gz opensim-SC_OLD-5139160ce4fd0f2abfa2ca2b26bbcfcb884fe2ce.tar.bz2 opensim-SC_OLD-5139160ce4fd0f2abfa2ca2b26bbcfcb884fe2ce.tar.xz |
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
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | 7 |
1 files changed, 7 insertions, 0 deletions
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 | |||
60 | private int m_MaxScriptQueue; | 60 | private int m_MaxScriptQueue; |
61 | private Scene m_Scene; | 61 | private Scene m_Scene; |
62 | private IConfig m_ScriptConfig = null; | 62 | private IConfig m_ScriptConfig = null; |
63 | private IConfigSource m_ConfigSource = null; | ||
63 | private ICompiler m_Compiler; | 64 | private ICompiler m_Compiler; |
64 | private int m_MinThreads; | 65 | private int m_MinThreads; |
65 | private int m_MaxThreads ; | 66 | private int m_MaxThreads ; |
@@ -148,6 +149,11 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
148 | get { return m_ScriptConfig; } | 149 | get { return m_ScriptConfig; } |
149 | } | 150 | } |
150 | 151 | ||
152 | public IConfigSource ConfigSource | ||
153 | { | ||
154 | get { return m_ConfigSource; } | ||
155 | } | ||
156 | |||
151 | public event ScriptRemoved OnScriptRemoved; | 157 | public event ScriptRemoved OnScriptRemoved; |
152 | public event ObjectRemoved OnObjectRemoved; | 158 | public event ObjectRemoved OnObjectRemoved; |
153 | 159 | ||
@@ -160,6 +166,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
160 | return; | 166 | return; |
161 | 167 | ||
162 | m_ScriptConfig = configSource.Configs["XEngine"]; | 168 | m_ScriptConfig = configSource.Configs["XEngine"]; |
169 | m_ConfigSource = configSource; | ||
163 | } | 170 | } |
164 | 171 | ||
165 | public void AddRegion(Scene scene) | 172 | public void AddRegion(Scene scene) |