merge

1 files changed, 7 insertions, 0 deletions

diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index 58178bc..f9f103a 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -33,6 +33,7 @@ using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Reflection;
+using System.Runtime;
 using System.Text;
 using System.Text.RegularExpressions;
 using System.Timers;
@@ -124,8 +125,11 @@ namespace OpenSim
                 Util.InitThreadPool(stpMinThreads, stpMaxThreads);
 
             m_log.Info("[OPENSIM MAIN]: Using async_call_method " + Util.FireAndForgetMethod);
+
+            m_log.InfoFormat("[OPENSIM MAIN] Running GC in {0} mode", GCSettings.IsServerGC ? "server":"workstation");
         }
 
+#if (_MONO)
         private static Mono.Unix.UnixSignal[] signals;
 
 
@@ -140,6 +144,7 @@ namespace OpenSim
                 MainConsole.Instance.RunCommand("shutdown");
             }
         });
+#endif
 
         /// <summary>
         /// Performs initialisation of the scene, such as loading configuration from disk.
@@ -150,6 +155,7 @@ namespace OpenSim
             m_log.Info("========================= STARTING OPENSIM =========================");
             m_log.Info("====================================================================");
 
+#if (_MONO)
             if(!Util.IsWindows())
             {
                 try
@@ -168,6 +174,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;