aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie Thielker2008-07-28 00:40:35 +0000
committerMelanie Thielker2008-07-28 00:40:35 +0000
commit9fca0aca6432f14cd68ffdc51703762ee7b575a3 (patch)
treecb74e6e4e49d944f33b9011604a15694063e2ae9
parentUse new LSL compiler by default in DotNetEngine and XEngine. Fix issues 1651,... (diff)
downloadopensim-SC_OLD-9fca0aca6432f14cd68ffdc51703762ee7b575a3.zip
opensim-SC_OLD-9fca0aca6432f14cd68ffdc51703762ee7b575a3.tar.gz
opensim-SC_OLD-9fca0aca6432f14cd68ffdc51703762ee7b575a3.tar.bz2
opensim-SC_OLD-9fca0aca6432f14cd68ffdc51703762ee7b575a3.tar.xz
Reinstate the configuration option on XEngine's use of the lexical
compiler. Changes the default in OpenSim.ini.example to "true" to allow for a broader user base for testing.
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs6
-rw-r--r--bin/OpenSim.ini.example2
2 files changed, 2 insertions, 6 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs
index 2386c6f..4962023 100644
--- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs
@@ -93,11 +93,7 @@ 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 96 m_UseCompiler = m_scriptEngine.Config.GetBoolean("UseNewCompiler", true);
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);
101 97
102 // Get some config 98 // Get some config
103 WriteScriptSourceToDebugFile = m_scriptEngine.Config.GetBoolean("WriteScriptSourceToDebugFile", true); 99 WriteScriptSourceToDebugFile = m_scriptEngine.Config.GetBoolean("WriteScriptSourceToDebugFile", true);
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 6622997..aa5708d 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -617,7 +617,7 @@ AutoSavePeriod = 15 ; Number of minutes between autosave backups
617 617
618[XEngine] 618[XEngine]
619; Use the newer LSL to CS compiler (experimental) 619; Use the newer LSL to CS compiler (experimental)
620UseNewCompiler = false 620UseNewCompiler = true
621; How many threads to keep alive even if nothing is happening 621; How many threads to keep alive even if nothing is happening
622MinThreads = 2 622MinThreads = 2
623; How many threads to start at maximum load 623; How many threads to start at maximum load