diff options
| author | UbitUmarov | 2017-05-09 23:22:36 +0100 |
|---|---|---|
| committer | UbitUmarov | 2017-05-09 23:22:36 +0100 |
| commit | 09c4952c6d60be9a2344c4295881bbb20e50d9eb (patch) | |
| tree | 3ce91c768ab37d966fa986a593cd4cc33f792328 /OpenSim/Server/Base/ServicesServerBase.cs | |
| parent | update mysql connector to v6.9.9 .net4.5 (diff) | |
| parent | let .net decide GC mode from its defaults on the platform (diff) | |
| download | opensim-SC-09c4952c6d60be9a2344c4295881bbb20e50d9eb.zip opensim-SC-09c4952c6d60be9a2344c4295881bbb20e50d9eb.tar.gz opensim-SC-09c4952c6d60be9a2344c4295881bbb20e50d9eb.tar.bz2 opensim-SC-09c4952c6d60be9a2344c4295881bbb20e50d9eb.tar.xz | |
merge
Diffstat (limited to 'OpenSim/Server/Base/ServicesServerBase.cs')
| -rw-r--r-- | OpenSim/Server/Base/ServicesServerBase.cs | 5 |
1 files changed, 4 insertions, 1 deletions
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 |