aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/DotNetEngine
diff options
context:
space:
mode:
authorMelanie Thielker2009-06-06 16:39:28 +0000
committerMelanie Thielker2009-06-06 16:39:28 +0000
commit5139160ce4fd0f2abfa2ca2b26bbcfcb884fe2ce (patch)
tree94b815ca0a937b4c9ae05d206d8fb732d79876dc /OpenSim/Region/ScriptEngine/DotNetEngine
parentsome code cleanup (diff)
downloadopensim-SC-5139160ce4fd0f2abfa2ca2b26bbcfcb884fe2ce.zip
opensim-SC-5139160ce4fd0f2abfa2ca2b26bbcfcb884fe2ce.tar.gz
opensim-SC-5139160ce4fd0f2abfa2ca2b26bbcfcb884fe2ce.tar.bz2
opensim-SC-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 'OpenSim/Region/ScriptEngine/DotNetEngine')
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs9
1 files changed, 7 insertions, 2 deletions
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
73 // that has been running too long 73 // that has been running too long
74 public static MaintenanceThread m_MaintenanceThread; 74 public static MaintenanceThread m_MaintenanceThread;
75 75
76 public IConfigSource ConfigSource; 76 private IConfigSource m_ConfigSource;
77 public IConfig ScriptConfigSource; 77 public IConfig ScriptConfigSource;
78 private bool m_enabled = false; 78 private bool m_enabled = false;
79 79
@@ -82,6 +82,11 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
82 get { return ScriptConfigSource; } 82 get { return ScriptConfigSource; }
83 } 83 }
84 84
85 public IConfigSource ConfigSource
86 {
87 get { return m_ConfigSource; }
88 }
89
85 // How many seconds between re-reading config-file. 90 // How many seconds between re-reading config-file.
86 // 0 = never. ScriptEngine will try to adjust to new config changes. 91 // 0 = never. ScriptEngine will try to adjust to new config changes.
87 public int RefreshConfigFileSeconds { 92 public int RefreshConfigFileSeconds {
@@ -119,7 +124,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
119 124
120 public void Initialise(IConfigSource config) 125 public void Initialise(IConfigSource config)
121 { 126 {
122 ConfigSource = config; 127 m_ConfigSource = config;
123 } 128 }
124 129
125 public void AddRegion(Scene Sceneworld) 130 public void AddRegion(Scene Sceneworld)