diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs
index b63a6ce815..bbfd097cf6 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs
@@ -36,8 +36,15 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
         /// <param name="Script">LSL script</param>
         /// <returns>Filename to .dll assembly</returns>
         public string CompileFromLSLText(string Script)
-        {
-            return CompileFromCSText(LSL_Converter.Convert(Script));
+        {
+            if (Script.Substring(0, 4).ToLower() == "//c#")
+            {
+                return LSL_Converter.Convert(Script);
+            }
+            else
+            {
+                return CompileFromCSText(LSL_Converter.Convert(Script));
+            }
         }
         /// <summary>
         /// Compile CS script to .Net assembly (.dll)