diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs index 58178bcf50..7ac6eb958e 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 d151de663e..4951776cf9 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 97ec8bf3f2..0000000000 Binary files a/bin/Mono.Posix.dll and /dev/null differ