diff options
| author | Tedd Hansen | 2007-08-14 15:59:36 +0000 |
|---|---|---|
| committer | Tedd Hansen | 2007-08-14 15:59:36 +0000 |
| commit | afaa12a9e2fd24c03c0f46716e9758cc591703c2 (patch) | |
| tree | f6f6977314ab65d88822b592378806142090e99d /OpenSim/Region/Application | |
| parent | More inventory work, should be able to now create new inventory folders and t... (diff) | |
| download | opensim-SC-afaa12a9e2fd24c03c0f46716e9758cc591703c2.zip opensim-SC-afaa12a9e2fd24c03c0f46716e9758cc591703c2.tar.gz opensim-SC-afaa12a9e2fd24c03c0f46716e9758cc591703c2.tar.bz2 opensim-SC-afaa12a9e2fd24c03c0f46716e9758cc591703c2.tar.xz | |
ScriptEngine: Some error handling, logs to logger
Diffstat (limited to 'OpenSim/Region/Application')
| -rw-r--r-- | OpenSim/Region/Application/OpenSimMain.cs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs index 4b95e02..1d1d337 100644 --- a/OpenSim/Region/Application/OpenSimMain.cs +++ b/OpenSim/Region/Application/OpenSimMain.cs | |||
| @@ -155,7 +155,7 @@ namespace OpenSim | |||
| 155 | } | 155 | } |
| 156 | 156 | ||
| 157 | // Load all script engines found | 157 | // Load all script engines found |
| 158 | //OpenSim.Region.Environment.Scenes.Scripting.ScriptEngineLoader ScriptEngineLoader = new OpenSim.Region.Environment.Scenes.Scripting.ScriptEngineLoader(); | 158 | OpenSim.Region.Environment.Scenes.Scripting.ScriptEngineLoader ScriptEngineLoader = new OpenSim.Region.Environment.Scenes.Scripting.ScriptEngineLoader(m_log); |
| 159 | 159 | ||
| 160 | for (int i = 0; i < configFiles.Length; i++) | 160 | for (int i = 0; i < configFiles.Length; i++) |
| 161 | { | 161 | { |
| @@ -166,11 +166,11 @@ namespace OpenSim | |||
| 166 | UDPServer udpServer; | 166 | UDPServer udpServer; |
| 167 | Scene scene = SetupScene(regionInfo, out udpServer); | 167 | Scene scene = SetupScene(regionInfo, out udpServer); |
| 168 | 168 | ||
| 169 | 169 | ||
| 170 | //OpenSim.Region.Environment.Scenes.Scripting.ScriptEngineInterface ScriptEngine = ScriptEngineLoader.LoadScriptEngine("DotNetEngine"); | 170 | OpenSim.Region.Environment.Scenes.Scripting.ScriptEngineInterface ScriptEngine = ScriptEngineLoader.LoadScriptEngine("DotNetEngine"); |
| 171 | //scene.AddScriptEngine(ScriptEngine); | 171 | scene.AddScriptEngine(ScriptEngine, m_log); |
| 172 | //// TODO: TEMP load default script | 172 | // TODO: TEMP load default script |
| 173 | //ScriptEngine.StartScript(Path.Combine("ScriptEngines", "default.lsl"), "TEST"); | 173 | ScriptEngine.StartScript(Path.Combine("ScriptEngines", "default.lsl"), "TEST"); |
| 174 | 174 | ||
| 175 | 175 | ||
| 176 | m_localScenes.Add(scene); | 176 | m_localScenes.Add(scene); |