aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorTedd Hansen2007-08-14 16:42:00 +0000
committerTedd Hansen2007-08-14 16:42:00 +0000
commit09e1f5f22e5ebfeed51ad5f46c12fbb63225a515 (patch)
treea5cec7dcf6af8a891ed42fbdb2167bcb293e8361
parentRemoved some debugging. Removed *.lso from project include in prebuild.xml. (diff)
downloadopensim-SC_OLD-09e1f5f22e5ebfeed51ad5f46c12fbb63225a515.zip
opensim-SC_OLD-09e1f5f22e5ebfeed51ad5f46c12fbb63225a515.tar.gz
opensim-SC_OLD-09e1f5f22e5ebfeed51ad5f46c12fbb63225a515.tar.bz2
opensim-SC_OLD-09e1f5f22e5ebfeed51ad5f46c12fbb63225a515.tar.xz
Correct caps of Default.lsl for Linux. Thanks again krinkec. :)
-rw-r--r--OpenSim/Region/Application/OpenSimMain.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs2
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index 1d1d337..887db67 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -170,7 +170,7 @@ namespace OpenSim
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, m_log); 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);
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
index 634c9ab..5f50a52 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
@@ -149,7 +149,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
149 //OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL_BuiltIn_Commands_Interface LSLB = new OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL_BuiltIn_Commands_TestImplementation(FullScriptID); 149 //OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL_BuiltIn_Commands_Interface LSLB = new OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL_BuiltIn_Commands_TestImplementation(FullScriptID);
150 150
151 // Start the script - giving it BuiltIns 151 // Start the script - giving it BuiltIns
152 myScriptEngine.m_logger.Verbose("ScriptEngine", "ScriptManager initializing script, handing over private builtin command interface"); 152 //myScriptEngine.m_logger.Verbose("ScriptEngine", "ScriptManager initializing script, handing over private builtin command interface");
153 Script.Start(myScriptEngine.World, ScriptID); 153 Script.Start(myScriptEngine.World, ScriptID);
154 154
155 155