aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase
diff options
context:
space:
mode:
authorTedd Hansen2008-02-02 02:35:56 +0000
committerTedd Hansen2008-02-02 02:35:56 +0000
commit8ccc12d642d1104bf4c1249a02a82d8af5d6efe0 (patch)
treef3691396c5649dbfc393b289cf7b5224cb251c85 /OpenSim/Region/ScriptEngine/Common/ScriptEngineBase
parentAdded OpenSim.32BitLaunch.exe that can be used on 64-bit systems to run OpenS... (diff)
downloadopensim-SC-8ccc12d642d1104bf4c1249a02a82d8af5d6efe0.zip
opensim-SC-8ccc12d642d1104bf4c1249a02a82d8af5d6efe0.tar.gz
opensim-SC-8ccc12d642d1104bf4c1249a02a82d8af5d6efe0.tar.bz2
opensim-SC-8ccc12d642d1104bf4c1249a02a82d8af5d6efe0.tar.xz
Added OpenSim.32BitLaunch.exe that can be used on 64-bit systems to run OpenSim in 32-bit mode.
Added VISUAL BASIC.NET-support //cs, //lsl and //vb as first characters of script will determine what compiler is used. Compile warnings are no longer treated as errors. Script will still run. Added a few useless and useful config options: Write script source to harddisk for debug, Default compile language, Allowed compilers (languages), compile in release or debug mode, clean up old scripts on startup Loads of warnings for incorrect config
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Common/ScriptEngineBase')
-rw-r--r--OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/MaintenanceThread.cs7
1 files changed, 6 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/MaintenanceThread.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/MaintenanceThread.cs
index 842bac9..dc98637 100644
--- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/MaintenanceThread.cs
+++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/MaintenanceThread.cs
@@ -58,6 +58,11 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase
58 /// </summary> 58 /// </summary>
59 private void StopMaintenanceThread() 59 private void StopMaintenanceThread()
60 { 60 {
61#if DEBUG
62 m_ScriptEngine.Log.Debug(m_ScriptEngine.ScriptEngineName, "StopMaintenanceThread() called");
63#endif
64 PleaseShutdown = true;
65 Thread.Sleep(100);
61 try 66 try
62 { 67 {
63 if (MaintenanceThreadThread != null) 68 if (MaintenanceThreadThread != null)
@@ -70,7 +75,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase
70 } 75 }
71 catch (Exception ex) 76 catch (Exception ex)
72 { 77 {
73 m_ScriptEngine.Log.Error("EventQueueManager", "Exception stopping maintenence thread: " + ex.ToString()); 78 m_ScriptEngine.Log.Error(m_ScriptEngine.ScriptEngineName, "Exception stopping maintenence thread: " + ex.ToString());
74 } 79 }
75 80
76 } 81 }