minor: further cleanup of old vb and yield prolog script engine references that were removed some time ago
parent
d7b9260496
commit
15b38f0036
|
@ -58,9 +58,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
|
|||
{
|
||||
lsl = 0,
|
||||
cs = 1,
|
||||
vb = 2,
|
||||
js = 3,
|
||||
yp = 4
|
||||
vb = 2
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
@ -131,8 +129,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
|
|||
LanguageMapping.Add(enumCompileType.cs.ToString(), enumCompileType.cs);
|
||||
LanguageMapping.Add(enumCompileType.vb.ToString(), enumCompileType.vb);
|
||||
LanguageMapping.Add(enumCompileType.lsl.ToString(), enumCompileType.lsl);
|
||||
LanguageMapping.Add(enumCompileType.js.ToString(), enumCompileType.js);
|
||||
LanguageMapping.Add(enumCompileType.yp.ToString(), enumCompileType.yp);
|
||||
|
||||
// Allowed compilers
|
||||
string allowComp = m_scriptEngine.Config.GetString("AllowedCompilers", "lsl");
|
||||
|
@ -336,12 +332,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
|
|||
if (source.StartsWith("//lsl", true, CultureInfo.InvariantCulture))
|
||||
language = enumCompileType.lsl;
|
||||
|
||||
if (source.StartsWith("//js", true, CultureInfo.InvariantCulture))
|
||||
language = enumCompileType.js;
|
||||
|
||||
if (source.StartsWith("//yp", true, CultureInfo.InvariantCulture))
|
||||
language = enumCompileType.yp;
|
||||
|
||||
// m_log.DebugFormat("[Compiler]: Compile language is {0}", language);
|
||||
|
||||
if (!AllowedCompilers.ContainsKey(language.ToString()))
|
||||
|
@ -527,12 +517,6 @@ namespace SecondLife
|
|||
m_scriptEngine.ScriptReferencedAssemblies,
|
||||
a => parameters.ReferencedAssemblies.Add(Path.Combine(rootPath, a)));
|
||||
|
||||
if (lang == enumCompileType.yp)
|
||||
{
|
||||
parameters.ReferencedAssemblies.Add(Path.Combine(rootPath,
|
||||
"OpenSim.Region.ScriptEngine.Shared.YieldProlog.dll"));
|
||||
}
|
||||
|
||||
parameters.GenerateExecutable = false;
|
||||
parameters.OutputAssembly = assembly;
|
||||
parameters.IncludeDebugInformation = CompileWithDebugInformation;
|
||||
|
|
|
@ -271,7 +271,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
|
|||
}
|
||||
|
||||
// m_log.DebugFormat(
|
||||
// "[SCRIPT INSTANCE]: Looking to load {0} from assembly {1} in {2}",
|
||||
// "[SCRIP
|
||||
// scriptType.FullName, m_Assembly, Engine.World.Name);
|
||||
|
||||
if (dom != System.AppDomain.CurrentDomain)
|
||||
|
|
|
@ -964,8 +964,6 @@ namespace OpenSim.Region.ScriptEngine.XEngine
|
|||
if (restOfFirstLine.StartsWith("c#")
|
||||
|| restOfFirstLine.StartsWith("vb")
|
||||
|| restOfFirstLine.StartsWith("lsl")
|
||||
|| restOfFirstLine.StartsWith("js")
|
||||
|| restOfFirstLine.StartsWith("yp")
|
||||
|| restOfFirstLine.Length == 0)
|
||||
warnRunningInXEngine = true;
|
||||
|
||||
|
|
Loading…
Reference in New Issue