aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorTedd Hansen2007-08-13 21:25:16 +0000
committerTedd Hansen2007-08-13 21:25:16 +0000
commit7b2663a41ee8ee6aab4d8412e310bfda50cae32e (patch)
tree63980e3b39eef116557a56aa4010c2584b4b308d
parentCommon script for all objects (Default.lsl). ScriptEngine touch_start event n... (diff)
downloadopensim-SC_OLD-7b2663a41ee8ee6aab4d8412e310bfda50cae32e.zip
opensim-SC_OLD-7b2663a41ee8ee6aab4d8412e310bfda50cae32e.tar.gz
opensim-SC_OLD-7b2663a41ee8ee6aab4d8412e310bfda50cae32e.tar.bz2
opensim-SC_OLD-7b2663a41ee8ee6aab4d8412e310bfda50cae32e.tar.xz
Disabled ScriptEngine until I add error handling tomorrow
-rw-r--r--OpenSim/Region/Application/OpenSimMain.cs8
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index cb2671a..cd53728 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -167,10 +167,10 @@ namespace OpenSim
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);
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);