aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared
diff options
context:
space:
mode:
authorMike Mazur2008-07-27 23:53:18 +0000
committerMike Mazur2008-07-27 23:53:18 +0000
commit9e58ce60c0ff21043779c55460de9234d658fe4c (patch)
tree6565d9c3c7fe29ce666022ceaf754d29ea256c4f /OpenSim/Region/ScriptEngine/Shared
parentRe-fix r5681. Sorry for the inconvenience. We will now return you (diff)
downloadopensim-SC-9e58ce60c0ff21043779c55460de9234d658fe4c.zip
opensim-SC-9e58ce60c0ff21043779c55460de9234d658fe4c.tar.gz
opensim-SC-9e58ce60c0ff21043779c55460de9234d658fe4c.tar.bz2
opensim-SC-9e58ce60c0ff21043779c55460de9234d658fe4c.tar.xz
Use new LSL compiler by default in DotNetEngine and XEngine. Fix issues 1651, 1339.
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs8
1 files changed, 6 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs
index cbf7980..2386c6f 100644
--- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs
@@ -82,7 +82,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
82 82
83 // private static int instanceID = new Random().Next(0, int.MaxValue); // Unique number to use on our compiled files 83 // private static int instanceID = new Random().Next(0, int.MaxValue); // Unique number to use on our compiled files
84 private static UInt64 scriptCompileCounter = 0; // And a counter 84 private static UInt64 scriptCompileCounter = 0; // And a counter
85 private bool m_UseCompiler = false; 85 private bool m_UseCompiler = true;
86 86
87 public IScriptEngine m_scriptEngine; 87 public IScriptEngine m_scriptEngine;
88 public Compiler(IScriptEngine scriptEngine) 88 public Compiler(IScriptEngine scriptEngine)
@@ -93,9 +93,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
93 public bool in_startup = true; 93 public bool in_startup = true;
94 public void ReadConfig() 94 public void ReadConfig()
95 { 95 {
96 // Turning on the compiler by default so hardcoding this option to
97 // true. Once it's clear we won't be going back to the old
98 // "compiler" this code will be removed completely.
99 // Mike, 2008.07.28
100 //m_UseCompiler = m_scriptEngine.Config.GetBoolean("UseNewCompiler", true);
96 101
97 // Get some config 102 // Get some config
98 m_UseCompiler = m_scriptEngine.Config.GetBoolean("UseNewCompiler", true);
99 WriteScriptSourceToDebugFile = m_scriptEngine.Config.GetBoolean("WriteScriptSourceToDebugFile", true); 103 WriteScriptSourceToDebugFile = m_scriptEngine.Config.GetBoolean("WriteScriptSourceToDebugFile", true);
100 CompileWithDebugInformation = m_scriptEngine.Config.GetBoolean("CompileWithDebugInformation", true); 104 CompileWithDebugInformation = m_scriptEngine.Config.GetBoolean("CompileWithDebugInformation", true);
101 105