diff options
author | Oren Hurvitz | 2014-03-26 21:31:16 +0200 |
---|---|---|
committer | Oren Hurvitz | 2014-03-26 20:34:55 +0100 |
commit | 7a47c15edbbebd93fc3355dfed68c2d5f635c897 (patch) | |
tree | 451e9121a86b6bcf9cf02855049f442d7bd5a866 /OpenSim/Region/CoreModules | |
parent | Revert "Use log-rolling on the log files (once per day)" (diff) | |
download | opensim-SC_OLD-7a47c15edbbebd93fc3355dfed68c2d5f635c897.zip opensim-SC_OLD-7a47c15edbbebd93fc3355dfed68c2d5f635c897.tar.gz opensim-SC_OLD-7a47c15edbbebd93fc3355dfed68c2d5f635c897.tar.bz2 opensim-SC_OLD-7a47c15edbbebd93fc3355dfed68c2d5f635c897.tar.xz |
- Increased the threadpool timeout to 10 minutes
- Changed a few places that launch long-lasting threads to skip the timeout altogether
Diffstat (limited to 'OpenSim/Region/CoreModules')
-rw-r--r-- | OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs index b270de9..c7bd3d0 100644 --- a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs +++ b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs | |||
@@ -963,10 +963,10 @@ namespace OpenSim.Region.CoreModules.Asset | |||
963 | case "assets": | 963 | case "assets": |
964 | con.Output("Ensuring assets are cached for all scenes."); | 964 | con.Output("Ensuring assets are cached for all scenes."); |
965 | 965 | ||
966 | Util.FireAndForget(delegate { | 966 | Util.RunThreadNoTimeout(delegate { |
967 | int assetReferenceTotal = TouchAllSceneAssets(true); | 967 | int assetReferenceTotal = TouchAllSceneAssets(true); |
968 | con.OutputFormat("Completed check with {0} assets.", assetReferenceTotal); | 968 | con.OutputFormat("Completed check with {0} assets.", assetReferenceTotal); |
969 | }); | 969 | }, "TouchAllSceneAssets", null); |
970 | 970 | ||
971 | break; | 971 | break; |
972 | 972 | ||