diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs
index 20f9770d3c..649485f4d5 100644
--- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs
@@ -369,14 +369,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
                 {
                     case enumCompileType.cs:
                         compileScript = CreateCSCompilerScript(
-                            compileScript,
+                            source,
                             m_scriptEngine.ScriptClassName,
                             m_scriptEngine.ScriptBaseClassName,
                             m_scriptEngine.ScriptBaseClassParameters);
                         break;
                     case enumCompileType.vb:
                         compileScript = CreateVBCompilerScript(
-                            compileScript, m_scriptEngine.ScriptClassName, m_scriptEngine.ScriptBaseClassName);
+                            source, m_scriptEngine.ScriptClassName, m_scriptEngine.ScriptBaseClassName);
                         break;
                 }
             }
@@ -549,6 +549,9 @@ namespace SecondLife
             parameters.TreatWarningsAsErrors = false;
             parameters.GenerateInMemory = false;
 
+            parameters.TempFiles = new TempFileCollection(Path.Combine(ScriptEnginesPath,
+                        m_scriptEngine.World.RegionInfo.RegionID.ToString()), CompileWithDebugInformation);
+
             CompilerResults results;
 
             CodeDomProvider provider;