aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorUbitUmarov2018-02-11 18:27:42 +0000
committerUbitUmarov2018-02-11 18:27:42 +0000
commit96aecf80ef933273bc75e1d77d9b5137fb05505a (patch)
tree0293ea4bbcdbba24dd8c20ca6ef0b87da3b02bd2 /OpenSim/Region
parentmantis 8287: applied modified patch by hand, thx watcher64 (diff)
downloadopensim-SC-96aecf80ef933273bc75e1d77d9b5137fb05505a.zip
opensim-SC-96aecf80ef933273bc75e1d77d9b5137fb05505a.tar.gz
opensim-SC-96aecf80ef933273bc75e1d77d9b5137fb05505a.tar.bz2
opensim-SC-96aecf80ef933273bc75e1d77d9b5137fb05505a.tar.xz
Oops... don't leave script source out of compilation in same cases
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs7
1 files changed, 5 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs
index 20f9770..649485f 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
369 { 369 {
370 case enumCompileType.cs: 370 case enumCompileType.cs:
371 compileScript = CreateCSCompilerScript( 371 compileScript = CreateCSCompilerScript(
372 compileScript, 372 source,
373 m_scriptEngine.ScriptClassName, 373 m_scriptEngine.ScriptClassName,
374 m_scriptEngine.ScriptBaseClassName, 374 m_scriptEngine.ScriptBaseClassName,
375 m_scriptEngine.ScriptBaseClassParameters); 375 m_scriptEngine.ScriptBaseClassParameters);
376 break; 376 break;
377 case enumCompileType.vb: 377 case enumCompileType.vb:
378 compileScript = CreateVBCompilerScript( 378 compileScript = CreateVBCompilerScript(
379 compileScript, m_scriptEngine.ScriptClassName, m_scriptEngine.ScriptBaseClassName); 379 source, m_scriptEngine.ScriptClassName, m_scriptEngine.ScriptBaseClassName);
380 break; 380 break;
381 } 381 }
382 } 382 }
@@ -549,6 +549,9 @@ namespace SecondLife
549 parameters.TreatWarningsAsErrors = false; 549 parameters.TreatWarningsAsErrors = false;
550 parameters.GenerateInMemory = false; 550 parameters.GenerateInMemory = false;
551 551
552 parameters.TempFiles = new TempFileCollection(Path.Combine(ScriptEnginesPath,
553 m_scriptEngine.World.RegionInfo.RegionID.ToString()), CompileWithDebugInformation);
554
552 CompilerResults results; 555 CompilerResults results;
553 556
554 CodeDomProvider provider; 557 CodeDomProvider provider;