aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid/ScriptServer
diff options
context:
space:
mode:
authorTedd Hansen2008-02-02 00:59:22 +0000
committerTedd Hansen2008-02-02 00:59:22 +0000
commit667197f24d1b9b050f1067f8a1fa757b7d46fdf6 (patch)
treea6e6cbcbcace7518f3591de30b9f46d6de9820ea /OpenSim/Grid/ScriptServer
parentThank you very much, Kinoc for : Moved the Listener loop try/catch to a bette... (diff)
downloadopensim-SC_OLD-667197f24d1b9b050f1067f8a1fa757b7d46fdf6.zip
opensim-SC_OLD-667197f24d1b9b050f1067f8a1fa757b7d46fdf6.tar.gz
opensim-SC_OLD-667197f24d1b9b050f1067f8a1fa757b7d46fdf6.tar.bz2
opensim-SC_OLD-667197f24d1b9b050f1067f8a1fa757b7d46fdf6.tar.xz
Added OpenSim.32BitLaunch.exe that can be used on 64-bit systems to run OpenSim in 32-bit mode.
Fixed ScriptEngine.Common startup problems.
Diffstat (limited to 'OpenSim/Grid/ScriptServer')
-rw-r--r--OpenSim/Grid/ScriptServer/ScriptServerMain.cs5
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Grid/ScriptServer/ScriptServerMain.cs b/OpenSim/Grid/ScriptServer/ScriptServerMain.cs
index d75cff7..5757be4 100644
--- a/OpenSim/Grid/ScriptServer/ScriptServerMain.cs
+++ b/OpenSim/Grid/ScriptServer/ScriptServerMain.cs
@@ -28,6 +28,7 @@
28 28
29using System.IO; 29using System.IO;
30using libsecondlife; 30using libsecondlife;
31using Nini.Config;
31using OpenSim.Framework; 32using OpenSim.Framework;
32using OpenSim.Framework.Console; 33using OpenSim.Framework.Console;
33using OpenSim.Grid.ScriptServer.ScriptServer; 34using OpenSim.Grid.ScriptServer.ScriptServer;
@@ -66,8 +67,8 @@ namespace OpenSim.Grid.ScriptServer
66 67
67 // Load DotNetEngine 68 // Load DotNetEngine
68 Engine = ScriptEngines.LoadEngine("DotNetEngine"); 69 Engine = ScriptEngines.LoadEngine("DotNetEngine");
69 70 IConfigSource config = null;
70 Engine.InitializeEngine(null, m_log, false, Engine.GetScriptManager()); 71 Engine.InitializeEngine(null, null, m_log, false, Engine.GetScriptManager());
71 72
72 73
73 // Set up server 74 // Set up server