diff options
| author | Justin Clark-Casey (justincc) | 2014-03-26 20:36:33 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2014-03-26 20:36:33 +0000 |
| commit | 6c447f892efa036927f4fa1c23a4c4732f15fe4e (patch) | |
| tree | 63e149e21226464c6053ff80abdec70bc6a03c9b /OpenSim/Framework | |
| parent | Fix extra physics params MSSQL migration (version 39). (diff) | |
| parent | - Increased the threadpool timeout to 10 minutes (diff) | |
| download | opensim-SC-6c447f892efa036927f4fa1c23a4c4732f15fe4e.zip opensim-SC-6c447f892efa036927f4fa1c23a4c4732f15fe4e.tar.gz opensim-SC-6c447f892efa036927f4fa1c23a4c4732f15fe4e.tar.bz2 opensim-SC-6c447f892efa036927f4fa1c23a4c4732f15fe4e.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Framework')
| -rw-r--r-- | OpenSim/Framework/Util.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs index ce4af8b..c7a7341 100644 --- a/OpenSim/Framework/Util.cs +++ b/OpenSim/Framework/Util.cs | |||
| @@ -2031,7 +2031,7 @@ namespace OpenSim.Framework | |||
| 2031 | // Maps (ThreadFunc number -> Thread) | 2031 | // Maps (ThreadFunc number -> Thread) |
| 2032 | private static ConcurrentDictionary<long, ThreadInfo> activeThreads = new ConcurrentDictionary<long, ThreadInfo>(); | 2032 | private static ConcurrentDictionary<long, ThreadInfo> activeThreads = new ConcurrentDictionary<long, ThreadInfo>(); |
| 2033 | 2033 | ||
| 2034 | private static readonly int THREAD_TIMEOUT = 60 * 1000; | 2034 | private static readonly int THREAD_TIMEOUT = 10 * 60 * 1000; // 10 minutes |
| 2035 | 2035 | ||
| 2036 | /// <summary> | 2036 | /// <summary> |
| 2037 | /// Finds threads in the main thread pool that have timed-out, and aborts them. | 2037 | /// Finds threads in the main thread pool that have timed-out, and aborts them. |