aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorTedd Hansen2007-08-17 19:47:40 +0000
committerTedd Hansen2007-08-17 19:47:40 +0000
commit577fb1a9876ef3a4056171d82a55e63449408173 (patch)
tree5df8d7d5f13c243c6c47de74e7cb28bc95b69314 /OpenSim
parent(2/2) Added DotSets.dll and Mono.PEToolkit.dll (diff)
downloadopensim-SC_OLD-577fb1a9876ef3a4056171d82a55e63449408173.zip
opensim-SC_OLD-577fb1a9876ef3a4056171d82a55e63449408173.tar.gz
opensim-SC_OLD-577fb1a9876ef3a4056171d82a55e63449408173.tar.bz2
opensim-SC_OLD-577fb1a9876ef3a4056171d82a55e63449408173.tar.xz
Removed RAIL test from startup for now...
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs1
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs3
2 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs
index 4ed7bd4..6e992be 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs
@@ -19,6 +19,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
19 19
20 // Output assembly name 20 // Output assembly name
21 string OutFile = Path.Combine("ScriptEngines", Path.GetFileNameWithoutExtension(LSOFileName) + ".dll"); 21 string OutFile = Path.Combine("ScriptEngines", Path.GetFileNameWithoutExtension(LSOFileName) + ".dll");
22 //string OutFile = Path.Combine("ScriptEngines", "SecondLife.Script.dll");
22 23
23 Common.SendToDebug("Reading source code into memory"); 24 Common.SendToDebug("Reading source code into memory");
24 // TODO: Add error handling 25 // TODO: Add error handling
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
index b6debcf..8fdac25 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
@@ -190,7 +190,8 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
190 private string ProcessYield(string FileName) 190 private string ProcessYield(string FileName)
191 { 191 {
192 // TODO: Create a new assembly and copy old but insert Yield Code 192 // TODO: Create a new assembly and copy old but insert Yield Code
193 return TempDotNetMicroThreadingCodeInjector.TestFix(FileName); 193 //return TempDotNetMicroThreadingCodeInjector.TestFix(FileName);
194 return FileName;
194 } 195 }
195 196
196 private AppDomain GetFreeAppDomain() 197 private AppDomain GetFreeAppDomain()