diff options
| author | Tedd Hansen | 2008-02-02 00:59:22 +0000 |
|---|---|---|
| committer | Tedd Hansen | 2008-02-02 00:59:22 +0000 |
| commit | 667197f24d1b9b050f1067f8a1fa757b7d46fdf6 (patch) | |
| tree | a6e6cbcbcace7518f3591de30b9f46d6de9820ea /OpenSim/Grid | |
| parent | Thank you very much, Kinoc for : Moved the Listener loop try/catch to a bette... (diff) | |
| download | opensim-SC-667197f24d1b9b050f1067f8a1fa757b7d46fdf6.zip opensim-SC-667197f24d1b9b050f1067f8a1fa757b7d46fdf6.tar.gz opensim-SC-667197f24d1b9b050f1067f8a1fa757b7d46fdf6.tar.bz2 opensim-SC-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')
| -rw-r--r-- | OpenSim/Grid/ScriptServer/ScriptServerMain.cs | 5 |
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 | ||
| 29 | using System.IO; | 29 | using System.IO; |
| 30 | using libsecondlife; | 30 | using libsecondlife; |
| 31 | using Nini.Config; | ||
| 31 | using OpenSim.Framework; | 32 | using OpenSim.Framework; |
| 32 | using OpenSim.Framework.Console; | 33 | using OpenSim.Framework.Console; |
| 33 | using OpenSim.Grid.ScriptServer.ScriptServer; | 34 | using 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 |