From 9dbe99af0fda41060e1123c65a3aca87618d0e89 Mon Sep 17 00:00:00 2001 From: "Justin Clark-Casey (justincc)" Date: Thu, 4 Dec 2014 01:53:42 +0000 Subject: [PATCH] If "fcache assets" is executed, don't stop with an exception if there's an access violation if another thread is operating on the file at the same time. Resolves one issue from http://opensimulator.org/mantis/view.php?id=7271 --- OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs index 7780568605..24d5d00c40 100644 --- a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs +++ b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs @@ -795,7 +795,7 @@ namespace OpenSim.Region.CoreModules.Asset if (File.Exists(filename)) { - File.SetLastAccessTime(filename, DateTime.Now); + UpdateFileLastAccessTime(filename); } else if (storeUncached) { @@ -811,7 +811,6 @@ namespace OpenSim.Region.CoreModules.Asset }); } - return uniqueUuids.Count; }