diff options
author | Justin Clark-Casey (justincc) | 2014-12-04 01:53:42 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2014-12-04 01:53:42 +0000 |
commit | 9dbe99af0fda41060e1123c65a3aca87618d0e89 (patch) | |
tree | 6a3c3c9811252b6174a1c675902277851c3072fa /OpenSim/Region | |
parent | refactor: breakout flotasm cache last file access time to separate UpdateFile... (diff) | |
download | opensim-SC_OLD-9dbe99af0fda41060e1123c65a3aca87618d0e89.zip opensim-SC_OLD-9dbe99af0fda41060e1123c65a3aca87618d0e89.tar.gz opensim-SC_OLD-9dbe99af0fda41060e1123c65a3aca87618d0e89.tar.bz2 opensim-SC_OLD-9dbe99af0fda41060e1123c65a3aca87618d0e89.tar.xz |
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
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs index 7780568..24d5d00 100644 --- a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs +++ b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs | |||
@@ -795,7 +795,7 @@ namespace OpenSim.Region.CoreModules.Asset | |||
795 | 795 | ||
796 | if (File.Exists(filename)) | 796 | if (File.Exists(filename)) |
797 | { | 797 | { |
798 | File.SetLastAccessTime(filename, DateTime.Now); | 798 | UpdateFileLastAccessTime(filename); |
799 | } | 799 | } |
800 | else if (storeUncached) | 800 | else if (storeUncached) |
801 | { | 801 | { |
@@ -811,7 +811,6 @@ namespace OpenSim.Region.CoreModules.Asset | |||
811 | }); | 811 | }); |
812 | } | 812 | } |
813 | 813 | ||
814 | |||
815 | return uniqueUuids.Count; | 814 | return uniqueUuids.Count; |
816 | } | 815 | } |
817 | 816 | ||