From 7a47c15edbbebd93fc3355dfed68c2d5f635c897 Mon Sep 17 00:00:00 2001
From: Oren Hurvitz
Date: Wed, 26 Mar 2014 21:31:16 +0200
Subject: - Increased the threadpool timeout to 10 minutes - Changed a few
 places that launch long-lasting threads to skip the timeout altogether

---
 OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Region/CoreModules/Asset')

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
                     case "assets":
                         con.Output("Ensuring assets are cached for all scenes.");
 
-                        Util.FireAndForget(delegate {
+                        Util.RunThreadNoTimeout(delegate {
                             int assetReferenceTotal = TouchAllSceneAssets(true);
                             con.OutputFormat("Completed check with {0} assets.", assetReferenceTotal);
-                        });
+                        }, "TouchAllSceneAssets", null);
 
                         break;
 
-- 
cgit v1.1