From 957ca41b13688be27c386e1b1d3db200c1ff0b87 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Tue, 9 May 2017 11:58:07 +0100 Subject: remove file bin/Mono.Posix.dll that causes problems with mono --- OpenSim/Region/Application/OpenSim.cs | 4 ++++ OpenSim/Server/Base/ServicesServerBase.cs | 5 ++++- bin/Mono.Posix.dll | Bin 207872 -> 0 bytes 3 files changed, 8 insertions(+), 1 deletion(-) delete mode 100755 bin/Mono.Posix.dll diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs index 58178bc..7ac6eb9 100644 --- a/OpenSim/Region/Application/OpenSim.cs +++ b/OpenSim/Region/Application/OpenSim.cs @@ -126,6 +126,7 @@ namespace OpenSim m_log.Info("[OPENSIM MAIN]: Using async_call_method " + Util.FireAndForgetMethod); } +#if (_MONO) private static Mono.Unix.UnixSignal[] signals; @@ -140,6 +141,7 @@ namespace OpenSim MainConsole.Instance.RunCommand("shutdown"); } }); +#endif /// /// Performs initialisation of the scene, such as loading configuration from disk. @@ -150,6 +152,7 @@ namespace OpenSim m_log.Info("========================= STARTING OPENSIM ========================="); m_log.Info("===================================================================="); +#if (_MONO) if(!Util.IsWindows()) { try @@ -168,6 +171,7 @@ namespace OpenSim m_log.Debug("Exception was: ", e); } } +#endif //m_log.InfoFormat("[OPENSIM MAIN]: GC Is Server GC: {0}", GCSettings.IsServerGC.ToString()); // http://msdn.microsoft.com/en-us/library/bb384202.aspx //GCSettings.LatencyMode = GCLatencyMode.Batch; diff --git a/OpenSim/Server/Base/ServicesServerBase.cs b/OpenSim/Server/Base/ServicesServerBase.cs index d151de6..4951776 100644 --- a/OpenSim/Server/Base/ServicesServerBase.cs +++ b/OpenSim/Server/Base/ServicesServerBase.cs @@ -61,8 +61,9 @@ namespace OpenSim.Server.Base // private bool m_Running = true; +#if (_MONO) private static Mono.Unix.UnixSignal[] signals; - +#endif // Handle all the automagical stuff // @@ -186,6 +187,7 @@ namespace OpenSim.Server.Base RegisterCommonCommands(); RegisterCommonComponents(Config); +#if (_MONO) Thread signal_thread = new Thread (delegate () { while (true) @@ -218,6 +220,7 @@ namespace OpenSim.Server.Base m_log.Debug("Exception was: ", e); } } +#endif // Allow derived classes to perform initialization that // needs to be done after the console has opened diff --git a/bin/Mono.Posix.dll b/bin/Mono.Posix.dll deleted file mode 100755 index 97ec8bf..0000000 Binary files a/bin/Mono.Posix.dll and /dev/null differ -- cgit v1.1