aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorTedd Hansen2008-02-02 03:17:38 +0000
committerTedd Hansen2008-02-02 03:17:38 +0000
commit5c8abed450939b24c4547063a828fe52f0bc685d (patch)
tree24cb732294c07d4ca95e3eca70611e35c41fa991 /OpenSim
parentAdded load/unload queue size limit (diff)
downloadopensim-SC_OLD-5c8abed450939b24c4547063a828fe52f0bc685d.zip
opensim-SC_OLD-5c8abed450939b24c4547063a828fe52f0bc685d.tar.gz
opensim-SC_OLD-5c8abed450939b24c4547063a828fe52f0bc685d.tar.bz2
opensim-SC_OLD-5c8abed450939b24c4547063a828fe52f0bc685d.tar.xz
Bugfix: LSL was mapped to VB.Net compiler ... that didn't work out so well :)
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs
index d3f2873..b919f22 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs
@@ -99,8 +99,8 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
99 } 99 }
100 100
101 LanguageMapping.Add("cs", enumCompileType.cs); 101 LanguageMapping.Add("cs", enumCompileType.cs);
102 LanguageMapping.Add("vb", enumCompileType.lsl); 102 LanguageMapping.Add("vb", enumCompileType.vb);
103 LanguageMapping.Add("lsl", enumCompileType.vb); 103 LanguageMapping.Add("lsl", enumCompileType.lsl);
104 104
105 // Allowed compilers 105 // Allowed compilers
106 string allowedCompilers = m_scriptEngine.ScriptConfigSource.GetString("AllowedCompilers", "lsl;cs;vb"); 106 string allowedCompilers = m_scriptEngine.ScriptConfigSource.GetString("AllowedCompilers", "lsl;cs;vb");
@@ -158,7 +158,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
158 158
159 foreach (string file in Directory.GetFiles(ScriptEnginesPath)) 159 foreach (string file in Directory.GetFiles(ScriptEnginesPath))
160 { 160 {
161 m_scriptEngine.Log.Error(m_scriptEngine.ScriptEngineName, "FILE FOUND: " + file); 161 //m_scriptEngine.Log.Error(m_scriptEngine.ScriptEngineName, "FILE FOUND: " + file);
162 162
163 if (file.ToLower().StartsWith(FilePrefix + "_compiled_") || 163 if (file.ToLower().StartsWith(FilePrefix + "_compiled_") ||
164 file.ToLower().StartsWith(FilePrefix + "_source_")) 164 file.ToLower().StartsWith(FilePrefix + "_source_"))