diff options
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Region/Application/OpenSim.cs | 4 | ||||
-rw-r--r-- | OpenSim/Server/Base/ServicesServerBase.cs | 5 |
2 files changed, 8 insertions, 1 deletions
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 | |||
126 | m_log.Info("[OPENSIM MAIN]: Using async_call_method " + Util.FireAndForgetMethod); | 126 | m_log.Info("[OPENSIM MAIN]: Using async_call_method " + Util.FireAndForgetMethod); |
127 | } | 127 | } |
128 | 128 | ||
129 | #if (_MONO) | ||
129 | private static Mono.Unix.UnixSignal[] signals; | 130 | private static Mono.Unix.UnixSignal[] signals; |
130 | 131 | ||
131 | 132 | ||
@@ -140,6 +141,7 @@ namespace OpenSim | |||
140 | MainConsole.Instance.RunCommand("shutdown"); | 141 | MainConsole.Instance.RunCommand("shutdown"); |
141 | } | 142 | } |
142 | }); | 143 | }); |
144 | #endif | ||
143 | 145 | ||
144 | /// <summary> | 146 | /// <summary> |
145 | /// Performs initialisation of the scene, such as loading configuration from disk. | 147 | /// Performs initialisation of the scene, such as loading configuration from disk. |
@@ -150,6 +152,7 @@ namespace OpenSim | |||
150 | m_log.Info("========================= STARTING OPENSIM ========================="); | 152 | m_log.Info("========================= STARTING OPENSIM ========================="); |
151 | m_log.Info("===================================================================="); | 153 | m_log.Info("===================================================================="); |
152 | 154 | ||
155 | #if (_MONO) | ||
153 | if(!Util.IsWindows()) | 156 | if(!Util.IsWindows()) |
154 | { | 157 | { |
155 | try | 158 | try |
@@ -168,6 +171,7 @@ namespace OpenSim | |||
168 | m_log.Debug("Exception was: ", e); | 171 | m_log.Debug("Exception was: ", e); |
169 | } | 172 | } |
170 | } | 173 | } |
174 | #endif | ||
171 | //m_log.InfoFormat("[OPENSIM MAIN]: GC Is Server GC: {0}", GCSettings.IsServerGC.ToString()); | 175 | //m_log.InfoFormat("[OPENSIM MAIN]: GC Is Server GC: {0}", GCSettings.IsServerGC.ToString()); |
172 | // http://msdn.microsoft.com/en-us/library/bb384202.aspx | 176 | // http://msdn.microsoft.com/en-us/library/bb384202.aspx |
173 | //GCSettings.LatencyMode = GCLatencyMode.Batch; | 177 | //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 | |||
61 | // | 61 | // |
62 | private bool m_Running = true; | 62 | private bool m_Running = true; |
63 | 63 | ||
64 | #if (_MONO) | ||
64 | private static Mono.Unix.UnixSignal[] signals; | 65 | private static Mono.Unix.UnixSignal[] signals; |
65 | 66 | #endif | |
66 | 67 | ||
67 | // Handle all the automagical stuff | 68 | // Handle all the automagical stuff |
68 | // | 69 | // |
@@ -186,6 +187,7 @@ namespace OpenSim.Server.Base | |||
186 | RegisterCommonCommands(); | 187 | RegisterCommonCommands(); |
187 | RegisterCommonComponents(Config); | 188 | RegisterCommonComponents(Config); |
188 | 189 | ||
190 | #if (_MONO) | ||
189 | Thread signal_thread = new Thread (delegate () | 191 | Thread signal_thread = new Thread (delegate () |
190 | { | 192 | { |
191 | while (true) | 193 | while (true) |
@@ -218,6 +220,7 @@ namespace OpenSim.Server.Base | |||
218 | m_log.Debug("Exception was: ", e); | 220 | m_log.Debug("Exception was: ", e); |
219 | } | 221 | } |
220 | } | 222 | } |
223 | #endif | ||
221 | 224 | ||
222 | // Allow derived classes to perform initialization that | 225 | // Allow derived classes to perform initialization that |
223 | // needs to be done after the console has opened | 226 | // needs to be done after the console has opened |