diff --git a/OpenSim/Framework/Monitoring/Watchdog.cs b/OpenSim/Framework/Monitoring/Watchdog.cs index 6ad3cdda89..7b9b92214b 100644 --- a/OpenSim/Framework/Monitoring/Watchdog.cs +++ b/OpenSim/Framework/Monitoring/Watchdog.cs @@ -197,8 +197,8 @@ namespace OpenSim.Framework.Monitoring // m_log.DebugFormat( // "[WATCHDOG]: Stop: Removing thread {0}, ID {1}", twi.Thread.Name, twi.Thread.ManagedThreadId); - if(t.IsAlive) - t.Abort(); + //if(t.IsAlive) + // t.Abort(); } m_threads.Clear(); } @@ -271,8 +271,8 @@ namespace OpenSim.Framework.Monitoring { if (m_threads.ContainsKey(threadID)) { - ThreadWatchdogInfo twi = m_threads[threadID]; - twi.Thread.Abort(); + //ThreadWatchdogInfo twi = m_threads[threadID]; + //twi.Thread.Abort(); RemoveThread(threadID); return true; diff --git a/OpenSim/Region/Application/Application.cs b/OpenSim/Region/Application/Application.cs index 14fe7c0f5a..4c4a926a49 100644 --- a/OpenSim/Region/Application/Application.cs +++ b/OpenSim/Region/Application/Application.cs @@ -73,6 +73,8 @@ namespace OpenSim // First line, hook the appdomain to the crash reporter AppDomain.CurrentDomain.UnhandledException += new UnhandledExceptionEventHandler(CurrentDomain_UnhandledException); + System.AppContext.SetSwitch("System.Drawing.EnableUnixSupport", true); + Culture.SetCurrentCulture(); Culture.SetDefaultCurrentCulture(); @@ -97,7 +99,7 @@ namespace OpenSim } else { - XmlConfigurator.Configure(); + XmlConfigurator.Configure(new System.IO.FileInfo("OpenSim.exe.config")); m_log.Info("[OPENSIM MAIN]: configured log4net using default OpenSim.exe.config"); } diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs index 104aa9ff13..e18419a933 100755 --- a/OpenSim/Region/Application/OpenSimBase.cs +++ b/OpenSim/Region/Application/OpenSimBase.cs @@ -40,7 +40,7 @@ using OpenSim.Framework.Console; using OpenSim.Framework.Servers; using OpenSim.Framework.Servers.HttpServer; using OpenSim.Framework.Monitoring; -using OpenSim.Region.CoreModules.ServiceConnectorsOut.UserAccounts; +//using OpenSim.Region.CoreModules.ServiceConnectorsOut.UserAccounts; using OpenSim.Region.Framework; using OpenSim.Region.Framework.Interfaces; using OpenSim.Region.Framework.Scenes; diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs index a96af2d18b..da8905f5bf 100755 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs @@ -1799,10 +1799,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP incomingPacket = null; } } + /* catch (ThreadAbortException) { Thread.ResetAbort(); } + */ catch (Exception ex) { m_log.Error("[LLUDPSERVER]: Error in the incoming packet handler loop: " + ex.Message, ex); diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 80295d753c..052654163f 100755 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs @@ -1612,7 +1612,7 @@ namespace OpenSim.Region.Framework.Scenes //proc.WaitForExit(); //Thread.Sleep(1000); //Environment.Exit(1); - m_heartbeatThread.Abort(); + //m_heartbeatThread.Abort(); Watchdog.AbortThread(m_heartbeatThread.ManagedThreadId); m_heartbeatThread = null; } diff --git a/OpenSim/Region/ScriptEngine/YEngine/XMREngXmrTestLs.cs b/OpenSim/Region/ScriptEngine/YEngine/XMREngXmrTestLs.cs index ea306c8119..9f23a67063 100644 --- a/OpenSim/Region/ScriptEngine/YEngine/XMREngXmrTestLs.cs +++ b/OpenSim/Region/ScriptEngine/YEngine/XMREngXmrTestLs.cs @@ -41,6 +41,9 @@ using LSL_Rotation = OpenSim.Region.ScriptEngine.Shared.LSL_Types.Quaternion; using LSL_String = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLString; using LSL_Vector = OpenSim.Region.ScriptEngine.Shared.LSL_Types.Vector3; +using SharedEventParams = OpenSim.Region.ScriptEngine.Shared.EventParams; +using SharedScriptBaseClass = OpenSim.Region.ScriptEngine.Shared.ScriptBase.ScriptBaseClass; + namespace OpenSim.Region.ScriptEngine.Yengine { public partial class Yengine @@ -253,8 +256,7 @@ namespace OpenSim.Region.ScriptEngine.Yengine return; i++; } - OpenSim.Region.ScriptEngine.Shared.EventParams eps = - new OpenSim.Region.ScriptEngine.Shared.EventParams(eventname, paramvalues, zeroDetectParams); + SharedEventParams eps = new SharedEventParams(eventname, paramvalues, zeroDetectParams); // Scan instance list to find those that match selection criteria. if(!Monitor.TryEnter(m_InstancesDict, 100)) @@ -367,7 +369,7 @@ namespace OpenSim.Region.ScriptEngine.Yengine } if(token is TokenName) { - FieldInfo field = typeof(OpenSim.Region.ScriptEngine.Shared.ScriptBase.ScriptBaseClass).GetField(((TokenName)token).val); + FieldInfo field = typeof(SharedScriptBaseClass).GetField(((TokenName)token).val); if((field != null) && field.IsPublic && (field.IsLiteral || (field.IsStatic && field.IsInitOnly))) { return field.GetValue(null); diff --git a/OpenSim/Region/ScriptEngine/YEngine/XMREngine.cs b/OpenSim/Region/ScriptEngine/YEngine/XMREngine.cs index 1b9d109331..bc7c946c91 100644 --- a/OpenSim/Region/ScriptEngine/YEngine/XMREngine.cs +++ b/OpenSim/Region/ScriptEngine/YEngine/XMREngine.cs @@ -60,6 +60,8 @@ using LSL_Rotation = OpenSim.Region.ScriptEngine.Shared.LSL_Types.Quaternion; using LSL_String = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLString; using LSL_Vector = OpenSim.Region.ScriptEngine.Shared.LSL_Types.Vector3; +using SceneScriptEvents = OpenSim.Region.Framework.Scenes.scriptEvents; + [assembly: Addin("YEngine", OpenSim.VersionInfo.VersionNumber)] [assembly: AddinDependency("OpenSim.Region.Framework", OpenSim.VersionInfo.VersionNumber)] @@ -229,7 +231,7 @@ namespace OpenSim.Region.ScriptEngine.Yengine catch { } try { - oscode = ((OpenSim.Region.Framework.Scenes.scriptEvents)(1ul << i)).ToString(); + oscode = ((SceneScriptEvents)(1ul << i)).ToString(); Convert.ToInt64(oscode); oscode = "undefined"; } @@ -712,8 +714,8 @@ namespace OpenSim.Region.ScriptEngine.Yengine lock(m_SleepQueue) Monitor.PulseAll(m_SleepQueue); - if(!m_SleepThread.Join(250)) - m_SleepThread.Abort(); + //if(!m_SleepThread.Join(250)) + // m_SleepThread.Abort(); m_SleepThread = null; } diff --git a/OpenSim/Region/ScriptEngine/YEngine/XMRInstCtor.cs b/OpenSim/Region/ScriptEngine/YEngine/XMRInstCtor.cs index d88ef02a40..e1e95c6964 100644 --- a/OpenSim/Region/ScriptEngine/YEngine/XMRInstCtor.cs +++ b/OpenSim/Region/ScriptEngine/YEngine/XMRInstCtor.cs @@ -30,7 +30,6 @@ using System.Threading; using System.Reflection; using System.Collections; using System.Collections.Generic; -using System.Runtime.Remoting.Lifetime; using System.Security.Policy; using System.IO; using System.Xml; diff --git a/OpenSim/Server/Base/HttpServerBase.cs b/OpenSim/Server/Base/HttpServerBase.cs index 8d569c14f0..79a43a4f00 100755 --- a/OpenSim/Server/Base/HttpServerBase.cs +++ b/OpenSim/Server/Base/HttpServerBase.cs @@ -123,13 +123,13 @@ namespace OpenSim.Server.Base if ( cert_path.Length == 0 ) { System.Console.WriteLine("Path to X509 certificate is missing, server can't start."); - Thread.CurrentThread.Abort(); + //Thread.CurrentThread.Abort(); } string cert_pass = networkConfig.GetString("cert_pass", string.Empty); if ( cert_pass.Length == 0 ) { System.Console.WriteLine("Password for X509 certificate is missing, server can't start."); - Thread.CurrentThread.Abort(); + //Thread.CurrentThread.Abort(); } MainServer.AddHttpServer(new BaseHttpServer(https_port, ssl_listener, cert_path, cert_pass));