diff options
author | Tedd Hansen | 2008-02-01 23:56:09 +0000 |
---|---|---|
committer | Tedd Hansen | 2008-02-01 23:56:09 +0000 |
commit | 694642a482ffefb9c11ef05d833c508f383d2f0d (patch) | |
tree | ac2dd670d40e53cf83a3069962d3feb9490b54b0 /OpenSim/Region/ScriptEngine/Common/ScriptEngineBase | |
parent | Bugfix, maybe it won't crash during startup and crash somewhere else instead? :) (diff) | |
download | opensim-SC_OLD-694642a482ffefb9c11ef05d833c508f383d2f0d.zip opensim-SC_OLD-694642a482ffefb9c11ef05d833c508f383d2f0d.tar.gz opensim-SC_OLD-694642a482ffefb9c11ef05d833c508f383d2f0d.tar.bz2 opensim-SC_OLD-694642a482ffefb9c11ef05d833c508f383d2f0d.tar.xz |
Moved iniFilePath to a static and put it in OpenSim.Application.iniFilePath.
Refreshing config based on this.
Temporarily disabled feature to refresh config file while running.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptEngine.cs | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptEngine.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptEngine.cs index c237282..a6d1019 100644 --- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptEngine.cs +++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptEngine.cs | |||
@@ -28,6 +28,7 @@ | |||
28 | 28 | ||
29 | 29 | ||
30 | using System; | 30 | using System; |
31 | using System.IO; | ||
31 | using Nini.Config; | 32 | using Nini.Config; |
32 | using OpenSim.Framework.Console; | 33 | using OpenSim.Framework.Console; |
33 | using OpenSim.Region.Environment.Interfaces; | 34 | using OpenSim.Region.Environment.Interfaces; |
@@ -128,8 +129,14 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase | |||
128 | RefreshConfigFileSeconds = ScriptConfigSource.GetInt("RefreshConfig", 0); | 129 | RefreshConfigFileSeconds = ScriptConfigSource.GetInt("RefreshConfig", 0); |
129 | 130 | ||
130 | // Reload from disk | 131 | // Reload from disk |
131 | ConfigSource.Reload(); | 132 | //ConfigSource.Reload(); |
132 | // Create a new object (probably not necessary?) | 133 | if (File.Exists(OpenSim.Application.iniFilePath)) |
134 | { | ||
135 | //ConfigSource.Merge(new IniConfigSource(OpenSim.Application.iniFilePath)); | ||
136 | } | ||
137 | |||
138 | |||
139 | // Create a new object (probably not necessary?) | ||
133 | // ScriptConfigSource = ConfigSource.Configs[ScriptEngineName]; | 140 | // ScriptConfigSource = ConfigSource.Configs[ScriptEngineName]; |
134 | 141 | ||
135 | if (m_EventQueueManager != null) m_EventQueueManager.ReadConfig(); | 142 | if (m_EventQueueManager != null) m_EventQueueManager.ReadConfig(); |