From 15b38f003623499a01f6f3e7bb4cfb9faa740734 Mon Sep 17 00:00:00 2001
From: "Justin Clark-Casey (justincc)" <jjustincc@googlemail.com>
Date: Fri, 11 Jul 2014 00:15:47 +0100
Subject: [PATCH] minor: further cleanup of old vb and yield prolog script
 engine references that were removed some time ago

---
 .../ScriptEngine/Shared/CodeTools/Compiler.cs  | 18 +-----------------
 .../Shared/Instance/ScriptInstance.cs          |  2 +-
 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 98658b6425..9379f8fe74 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
         {
             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;
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
index 979c84ab1d..9da2168585 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
                 }
 
 //                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)
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
index 7cb4862e04..8d121664af 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
@@ -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;