OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

minor: further cleanup of old vb and yield prolog script engine references that were removed some time ago

bullet-2.82
Justin Clark-Casey (justincc) 2014-07-11 00:15:47 +01:00
parent d7b9260496
commit 15b38f0036
3 changed files with 2 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs
View File

@ -58,9 +58,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
{ {
lsl = 0, lsl = 0,
cs = 1, cs = 1,
vb = 2, vb = 2
js = 3,
yp = 4
} }
/// <summary> /// <summary>
@ -131,8 +129,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
LanguageMapping.Add(enumCompileType.cs.ToString(), enumCompileType.cs); LanguageMapping.Add(enumCompileType.cs.ToString(), enumCompileType.cs);
LanguageMapping.Add(enumCompileType.vb.ToString(), enumCompileType.vb); LanguageMapping.Add(enumCompileType.vb.ToString(), enumCompileType.vb);
LanguageMapping.Add(enumCompileType.lsl.ToString(), enumCompileType.lsl); LanguageMapping.Add(enumCompileType.lsl.ToString(), enumCompileType.lsl);
LanguageMapping.Add(enumCompileType.js.ToString(), enumCompileType.js);
LanguageMapping.Add(enumCompileType.yp.ToString(), enumCompileType.yp);
// Allowed compilers // Allowed compilers
string allowComp = m_scriptEngine.Config.GetString("AllowedCompilers", "lsl"); 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)) if (source.StartsWith("//lsl", true, CultureInfo.InvariantCulture))
language = enumCompileType.lsl; 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); // m_log.DebugFormat("[Compiler]: Compile language is {0}", language);
if (!AllowedCompilers.ContainsKey(language.ToString())) if (!AllowedCompilers.ContainsKey(language.ToString()))
@ -527,12 +517,6 @@ namespace SecondLife
m_scriptEngine.ScriptReferencedAssemblies, m_scriptEngine.ScriptReferencedAssemblies,
a => parameters.ReferencedAssemblies.Add(Path.Combine(rootPath, a))); 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.GenerateExecutable = false;
parameters.OutputAssembly = assembly; parameters.OutputAssembly = assembly;
parameters.IncludeDebugInformation = CompileWithDebugInformation; parameters.IncludeDebugInformation = CompileWithDebugInformation;

2
OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
View File

@ -271,7 +271,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
} }
// m_log.DebugFormat( // m_log.DebugFormat(
// "[SCRIPT INSTANCE]: Looking to load {0} from assembly {1} in {2}", // "[SCRIP
// scriptType.FullName, m_Assembly, Engine.World.Name); // scriptType.FullName, m_Assembly, Engine.World.Name);
if (dom != System.AppDomain.CurrentDomain) if (dom != System.AppDomain.CurrentDomain)

2
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
View File

@ -964,8 +964,6 @@ namespace OpenSim.Region.ScriptEngine.XEngine
if (restOfFirstLine.StartsWith("c#") if (restOfFirstLine.StartsWith("c#")
|| restOfFirstLine.StartsWith("vb") || restOfFirstLine.StartsWith("vb")
|| restOfFirstLine.StartsWith("lsl") || restOfFirstLine.StartsWith("lsl")
|| restOfFirstLine.StartsWith("js")
|| restOfFirstLine.StartsWith("yp")
|| restOfFirstLine.Length == 0) || restOfFirstLine.Length == 0)
warnRunningInXEngine = true; warnRunningInXEngine = true;