diff options
| author | Melanie | 2013-06-23 01:49:45 +0100 |
|---|---|---|
| committer | Melanie | 2013-06-23 01:49:45 +0100 |
| commit | 936700bda3969bc54166f0d6a3ca81e3d5c42935 (patch) | |
| tree | 6bb97abf25f4a3f22ccb40e3b4be20c551327b09 /OpenSim/Region/Application/Application.cs | |
| parent | Fix prim locking to behave like SL (diff) | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC_OLD-936700bda3969bc54166f0d6a3ca81e3d5c42935.zip opensim-SC_OLD-936700bda3969bc54166f0d6a3ca81e3d5c42935.tar.gz opensim-SC_OLD-936700bda3969bc54166f0d6a3ca81e3d5c42935.tar.bz2 opensim-SC_OLD-936700bda3969bc54166f0d6a3ca81e3d5c42935.tar.xz | |
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Application/Application.cs')
| -rw-r--r-- | OpenSim/Region/Application/Application.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/Application/Application.cs b/OpenSim/Region/Application/Application.cs index c3e7ec2..e451aa8 100644 --- a/OpenSim/Region/Application/Application.cs +++ b/OpenSim/Region/Application/Application.cs | |||
| @@ -124,6 +124,7 @@ namespace OpenSim | |||
| 124 | workerThreads = workerThreadsMax; | 124 | workerThreads = workerThreadsMax; |
| 125 | m_log.InfoFormat("[OPENSIM MAIN]: Limiting worker threads to {0}",workerThreads); | 125 | m_log.InfoFormat("[OPENSIM MAIN]: Limiting worker threads to {0}",workerThreads); |
| 126 | } | 126 | } |
| 127 | |||
| 127 | // Increase the number of IOCP threads available. | 128 | // Increase the number of IOCP threads available. |
| 128 | // Mono defaults to a tragically low number (24 on 6-core / 8GB Fedora 17) | 129 | // Mono defaults to a tragically low number (24 on 6-core / 8GB Fedora 17) |
| 129 | if (iocpThreads < iocpThreadsMin) | 130 | if (iocpThreads < iocpThreadsMin) |