diff options
author | UbitUmarov | 2018-02-18 13:55:19 +0000 |
---|---|---|
committer | UbitUmarov | 2018-02-18 13:55:19 +0000 |
commit | 467b591f3a71a8d776fbda143076b290c9ac4b82 (patch) | |
tree | b2a7857a197c7b464483d9885d0de64f9de9ad36 /OpenSim/Region | |
parent | try to fix xmr on multiregions per instance. Ugly spargetti ...; remove fixes... (diff) | |
download | opensim-SC-467b591f3a71a8d776fbda143076b290c9ac4b82.zip opensim-SC-467b591f3a71a8d776fbda143076b290c9ac4b82.tar.gz opensim-SC-467b591f3a71a8d776fbda143076b290c9ac4b82.tar.bz2 opensim-SC-467b591f3a71a8d776fbda143076b290c9ac4b82.tar.xz |
COmment out relocation of tmp cs source file during compilation. This seems to cause issues on same win servers, and is only usefull on deep scripts debug (Xengine compiler)
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs index 20f9770..89211a5 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,10 @@ namespace SecondLife | |||
549 | parameters.TreatWarningsAsErrors = false; | 549 | parameters.TreatWarningsAsErrors = false; |
550 | parameters.GenerateInMemory = false; | 550 | parameters.GenerateInMemory = false; |
551 | 551 | ||
552 | // this seems to cause issues on some windows servers | ||
553 | // parameters.TempFiles = new TempFileCollection(Path.Combine(ScriptEnginesPath, | ||
554 | // m_scriptEngine.World.RegionInfo.RegionID.ToString()), CompileWithDebugInformation); | ||
555 | |||
552 | CompilerResults results; | 556 | CompilerResults results; |
553 | 557 | ||
554 | CodeDomProvider provider; | 558 | CodeDomProvider provider; |