From 667197f24d1b9b050f1067f8a1fa757b7d46fdf6 Mon Sep 17 00:00:00 2001
From: Tedd Hansen
Date: Sat, 2 Feb 2008 00:59:22 +0000
Subject: Added OpenSim.32BitLaunch.exe that can be used on 64-bit systems to
 run OpenSim in 32-bit mode. Fixed ScriptEngine.Common startup problems.

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

(limited to 'OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptEngine.cs')

diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptEngine.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptEngine.cs
index a6d1019..ea8ae1f 100644
--- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptEngine.cs
+++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptEngine.cs
@@ -86,13 +86,18 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase
             get { return m_log; }
         }
 
-        public void InitializeEngine(Scene Sceneworld, LogBase logger, bool HookUpToServer, ScriptManager newScriptManager)
+        public void InitializeEngine(Scene Sceneworld, IConfigSource config, LogBase logger, bool HookUpToServer, ScriptManager newScriptManager)
         {
             World = Sceneworld;
             m_log = logger;
-            ScriptConfigSource = ConfigSource.Configs[ScriptEngineName];
+            ConfigSource = config;
+            Log.Verbose(ScriptEngineName, "ScriptEngine initializing");
+            Log.Verbose(ScriptEngineName, "Reading configuration from config section \"" + ScriptEngineName + "\"");
 
-            Log.Verbose(ScriptEngineName, "DotNet & LSL ScriptEngine initializing");
+            // Make sure we have config
+            if (ConfigSource.Configs[ScriptEngineName] == null)
+                ConfigSource.AddConfig(ScriptEngineName);
+            ScriptConfigSource = ConfigSource.Configs[ScriptEngineName];
 
             //m_logger.Status(ScriptEngineName, "InitializeEngine");
 
-- 
cgit v1.1