diff options
author | Tedd Hansen | 2007-08-25 19:08:15 +0000 |
---|---|---|
committer | Tedd Hansen | 2007-08-25 19:08:15 +0000 |
commit | b75c1b2191640f4a140dc4cd0e8ce35ab64863d9 (patch) | |
tree | 05a5194e8e304df86897003bdbceca68fd65fd80 /OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL | |
parent | Scripts no longer crash sim after 5 minutes (override InitializeLifetimeServi... (diff) | |
download | opensim-SC-b75c1b2191640f4a140dc4cd0e8ce35ab64863d9.zip opensim-SC-b75c1b2191640f4a140dc4cd0e8ce35ab64863d9.tar.gz opensim-SC-b75c1b2191640f4a140dc4cd0e8ce35ab64863d9.tar.bz2 opensim-SC-b75c1b2191640f4a140dc4cd0e8ce35ab64863d9.tar.xz |
Added class for "long commands" (command that returns as event) with dedicated thread for processing. Added support for llSetTimerEvent(). Deleting old compiled scripts before new compile is attempted (avoids loading wrong script on compile error).
Diffstat (limited to 'OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL')
-rw-r--r-- | OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs | 8 | ||||
-rw-r--r-- | OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL_BaseClass.cs | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs index b58e996..f24eb63 100644 --- a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs +++ b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs | |||
@@ -51,6 +51,14 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL | |||
51 | // Output assembly name | 51 | // Output assembly name |
52 | ScriptCompileCounter++; | 52 | ScriptCompileCounter++; |
53 | string OutFile = Path.Combine("ScriptEngines", "Script_" + ScriptCompileCounter + ".dll"); | 53 | string OutFile = Path.Combine("ScriptEngines", "Script_" + ScriptCompileCounter + ".dll"); |
54 | try | ||
55 | { | ||
56 | System.IO.File.Delete(OutFile); | ||
57 | } | ||
58 | catch (Exception e) | ||
59 | { | ||
60 | Console.WriteLine("Exception attempting to delete old compiled script: " + e.ToString()); | ||
61 | } | ||
54 | //string OutFile = Path.Combine("ScriptEngines", "SecondLife.Script.dll"); | 62 | //string OutFile = Path.Combine("ScriptEngines", "SecondLife.Script.dll"); |
55 | 63 | ||
56 | // DEBUG - write source to disk | 64 | // DEBUG - write source to disk |
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL_BaseClass.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL_BaseClass.cs index cb0f9ba..9af9c82 100644 --- a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL_BaseClass.cs +++ b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL_BaseClass.cs | |||
@@ -15,7 +15,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL | |||
15 | // Object never expires | 15 | // Object never expires |
16 | public override Object InitializeLifetimeService() | 16 | public override Object InitializeLifetimeService() |
17 | { | 17 | { |
18 | Console.WriteLine("LSL_BaseClass: InitializeLifetimeService()"); | 18 | //Console.WriteLine("LSL_BaseClass: InitializeLifetimeService()"); |
19 | // return null; | 19 | // return null; |
20 | ILease lease = (ILease)base.InitializeLifetimeService(); | 20 | ILease lease = (ILease)base.InitializeLifetimeService(); |
21 | 21 | ||