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/DotNetEngine/ScriptEngine.cs | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'OpenSim/Region/ScriptEngine/DotNetEngine') diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs index 8651b03..5549ea8 100644 --- a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs +++ b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs @@ -73,7 +73,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine // that has been running too long public static MaintenanceThread m_MaintenanceThread; - public IConfigSource ConfigSource; + private IConfigSource m_ConfigSource; public IConfig ScriptConfigSource; private bool m_enabled = false; @@ -82,6 +82,11 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine get { return ScriptConfigSource; } } + public IConfigSource ConfigSource + { + get { return m_ConfigSource; } + } + // How many seconds between re-reading config-file. // 0 = never. ScriptEngine will try to adjust to new config changes. public int RefreshConfigFileSeconds { @@ -119,7 +124,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine public void Initialise(IConfigSource config) { - ConfigSource = config; + m_ConfigSource = config; } public void AddRegion(Scene Sceneworld) -- cgit v1.1