aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application
diff options
context:
space:
mode:
authorTedd Hansen2007-08-13 20:55:07 +0000
committerTedd Hansen2007-08-13 20:55:07 +0000
commit79dc1a4f7d4196d14bd51cb0839b9dd8c644cab7 (patch)
treee07b695666f9fe6e90a674706ebdc9509dd33065 /OpenSim/Region/Application
parentcommitted a test version of OpenSimAssetSet.xml in last commit, so fixing that. (diff)
downloadopensim-SC_OLD-79dc1a4f7d4196d14bd51cb0839b9dd8c644cab7.zip
opensim-SC_OLD-79dc1a4f7d4196d14bd51cb0839b9dd8c644cab7.tar.gz
opensim-SC_OLD-79dc1a4f7d4196d14bd51cb0839b9dd8c644cab7.tar.bz2
opensim-SC_OLD-79dc1a4f7d4196d14bd51cb0839b9dd8c644cab7.tar.xz
Common script for all objects (Default.lsl). ScriptEngine touch_start event now works, but llSay only outputs to server console.
Diffstat (limited to 'OpenSim/Region/Application')
-rw-r--r--OpenSim/Region/Application/OpenSimMain.cs6
1 files changed, 5 insertions, 1 deletions
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index 4dd5fe1..cb2671a 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -167,7 +167,11 @@ namespace OpenSim
167 Scene scene = SetupScene(regionInfo, out udpServer); 167 Scene scene = SetupScene(regionInfo, out udpServer);
168 168
169 169
170 scene.AddScriptEngine(ScriptEngineLoader.LoadScriptEngine("DotNetEngine")); 170 OpenSim.Region.Environment.Scenes.Scripting.ScriptEngineInterface ScriptEngine = ScriptEngineLoader.LoadScriptEngine("DotNetEngine");
171 scene.AddScriptEngine(ScriptEngine);
172 // TODO: TEMP load default script
173 ScriptEngine.StartScript(Path.Combine("ScriptEngines", "default.lsl"), "TEST");
174
171 175
172 m_localScenes.Add(scene); 176 m_localScenes.Add(scene);
173 177