diff options
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs | 18 | ||||
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | 2 |
3 files changed, 2 insertions, 20 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs index 98658b6..9379f8f 100644 --- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs +++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs | |||
@@ -58,9 +58,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools | |||
58 | { | 58 | { |
59 | lsl = 0, | 59 | lsl = 0, |
60 | cs = 1, | 60 | cs = 1, |
61 | vb = 2, | 61 | vb = 2 |
62 | js = 3, | ||
63 | yp = 4 | ||
64 | } | 62 | } |
65 | 63 | ||
66 | /// <summary> | 64 | /// <summary> |
@@ -131,8 +129,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools | |||
131 | LanguageMapping.Add(enumCompileType.cs.ToString(), enumCompileType.cs); | 129 | LanguageMapping.Add(enumCompileType.cs.ToString(), enumCompileType.cs); |
132 | LanguageMapping.Add(enumCompileType.vb.ToString(), enumCompileType.vb); | 130 | LanguageMapping.Add(enumCompileType.vb.ToString(), enumCompileType.vb); |
133 | LanguageMapping.Add(enumCompileType.lsl.ToString(), enumCompileType.lsl); | 131 | LanguageMapping.Add(enumCompileType.lsl.ToString(), enumCompileType.lsl); |
134 | LanguageMapping.Add(enumCompileType.js.ToString(), enumCompileType.js); | ||
135 | LanguageMapping.Add(enumCompileType.yp.ToString(), enumCompileType.yp); | ||
136 | 132 | ||
137 | // Allowed compilers | 133 | // Allowed compilers |
138 | string allowComp = m_scriptEngine.Config.GetString("AllowedCompilers", "lsl"); | 134 | string allowComp = m_scriptEngine.Config.GetString("AllowedCompilers", "lsl"); |
@@ -336,12 +332,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools | |||
336 | if (source.StartsWith("//lsl", true, CultureInfo.InvariantCulture)) | 332 | if (source.StartsWith("//lsl", true, CultureInfo.InvariantCulture)) |
337 | language = enumCompileType.lsl; | 333 | language = enumCompileType.lsl; |
338 | 334 | ||
339 | if (source.StartsWith("//js", true, CultureInfo.InvariantCulture)) | ||
340 | language = enumCompileType.js; | ||
341 | |||
342 | if (source.StartsWith("//yp", true, CultureInfo.InvariantCulture)) | ||
343 | language = enumCompileType.yp; | ||
344 | |||
345 | // m_log.DebugFormat("[Compiler]: Compile language is {0}", language); | 335 | // m_log.DebugFormat("[Compiler]: Compile language is {0}", language); |
346 | 336 | ||
347 | if (!AllowedCompilers.ContainsKey(language.ToString())) | 337 | if (!AllowedCompilers.ContainsKey(language.ToString())) |
@@ -527,12 +517,6 @@ namespace SecondLife | |||
527 | m_scriptEngine.ScriptReferencedAssemblies, | 517 | m_scriptEngine.ScriptReferencedAssemblies, |
528 | a => parameters.ReferencedAssemblies.Add(Path.Combine(rootPath, a))); | 518 | a => parameters.ReferencedAssemblies.Add(Path.Combine(rootPath, a))); |
529 | 519 | ||
530 | if (lang == enumCompileType.yp) | ||
531 | { | ||
532 | parameters.ReferencedAssemblies.Add(Path.Combine(rootPath, | ||
533 | "OpenSim.Region.ScriptEngine.Shared.YieldProlog.dll")); | ||
534 | } | ||
535 | |||
536 | parameters.GenerateExecutable = false; | 520 | parameters.GenerateExecutable = false; |
537 | parameters.OutputAssembly = assembly; | 521 | parameters.OutputAssembly = assembly; |
538 | parameters.IncludeDebugInformation = CompileWithDebugInformation; | 522 | parameters.IncludeDebugInformation = CompileWithDebugInformation; |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs index 979c84a..9da2168 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | |||
@@ -271,7 +271,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance | |||
271 | } | 271 | } |
272 | 272 | ||
273 | // m_log.DebugFormat( | 273 | // m_log.DebugFormat( |
274 | // "[SCRIPT INSTANCE]: Looking to load {0} from assembly {1} in {2}", | 274 | // "[SCRIP |
275 | // scriptType.FullName, m_Assembly, Engine.World.Name); | 275 | // scriptType.FullName, m_Assembly, Engine.World.Name); |
276 | 276 | ||
277 | if (dom != System.AppDomain.CurrentDomain) | 277 | if (dom != System.AppDomain.CurrentDomain) |
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs index 7cb4862..8d12166 100644 --- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs +++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | |||
@@ -964,8 +964,6 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
964 | if (restOfFirstLine.StartsWith("c#") | 964 | if (restOfFirstLine.StartsWith("c#") |
965 | || restOfFirstLine.StartsWith("vb") | 965 | || restOfFirstLine.StartsWith("vb") |
966 | || restOfFirstLine.StartsWith("lsl") | 966 | || restOfFirstLine.StartsWith("lsl") |
967 | || restOfFirstLine.StartsWith("js") | ||
968 | || restOfFirstLine.StartsWith("yp") | ||
969 | || restOfFirstLine.Length == 0) | 967 | || restOfFirstLine.Length == 0) |
970 | warnRunningInXEngine = true; | 968 | warnRunningInXEngine = true; |
971 | 969 | ||