From 694642a482ffefb9c11ef05d833c508f383d2f0d Mon Sep 17 00:00:00 2001
From: Tedd Hansen
Date: Fri, 1 Feb 2008 23:56:09 +0000
Subject: 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.

---
 .../ScriptEngine/Common/ScriptEngineBase/ScriptEngine.cs      | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Region/ScriptEngine')

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 @@
 
 
 using System;
+using System.IO;
 using Nini.Config;
 using OpenSim.Framework.Console;
 using OpenSim.Region.Environment.Interfaces;
@@ -128,8 +129,14 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase
             RefreshConfigFileSeconds = ScriptConfigSource.GetInt("RefreshConfig", 0);
 
             // Reload from disk
-            ConfigSource.Reload();
-            // Create a new object (probably not necessary?)
+            //ConfigSource.Reload();
+            if (File.Exists(OpenSim.Application.iniFilePath))
+            {
+                //ConfigSource.Merge(new IniConfigSource(OpenSim.Application.iniFilePath));
+            }
+        
+
+        // Create a new object (probably not necessary?)
 //            ScriptConfigSource = ConfigSource.Configs[ScriptEngineName];
 
             if (m_EventQueueManager != null) m_EventQueueManager.ReadConfig();
-- 
cgit v1.1