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/Region | |
| parent | Fix extra physics params MSSQL migration (version 39). (diff) | |
| parent | - Increased the threadpool timeout to 10 minutes (diff) | |
| download | opensim-SC_OLD-6c447f892efa036927f4fa1c23a4c4732f15fe4e.zip opensim-SC_OLD-6c447f892efa036927f4fa1c23a4c4732f15fe4e.tar.gz opensim-SC_OLD-6c447f892efa036927f4fa1c23a4c4732f15fe4e.tar.bz2 opensim-SC_OLD-6c447f892efa036927f4fa1c23a4c4732f15fe4e.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region')
| -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 | ||