diff options
author | Justin Clark-Casey (justincc) | 2014-12-04 01:46:00 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2014-12-04 01:46:00 +0000 |
commit | c36bfdc60f62b53e87de0ed3dbbd8e63c8a8f007 (patch) | |
tree | 049c6a85cd1b1cd580a9f0e1bc2dcc4297833bc3 /OpenSim/Region/CoreModules | |
parent | Remove long unused region parameters from SceneBase. Some of these weren't e... (diff) | |
download | opensim-SC-c36bfdc60f62b53e87de0ed3dbbd8e63c8a8f007.zip opensim-SC-c36bfdc60f62b53e87de0ed3dbbd8e63c8a8f007.tar.gz opensim-SC-c36bfdc60f62b53e87de0ed3dbbd8e63c8a8f007.tar.bz2 opensim-SC-c36bfdc60f62b53e87de0ed3dbbd8e63c8a8f007.tar.xz |
Don't worry about checking FlotsamAssetCache.m_CurrentlyWriting when updating access time.
The majority of updates won't be for anything currently writing and any sharing exception from an actual clash can be caught and ignored anyway.
Diffstat (limited to 'OpenSim/Region/CoreModules')
-rw-r--r-- | OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs index fe9a17d..bc5b39b 100644 --- a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs +++ b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs | |||
@@ -256,16 +256,9 @@ namespace OpenSim.Region.CoreModules.Asset | |||
256 | // If the file is already cached, don't cache it, just touch it so access time is updated | 256 | // If the file is already cached, don't cache it, just touch it so access time is updated |
257 | if (File.Exists(filename)) | 257 | if (File.Exists(filename)) |
258 | { | 258 | { |
259 | // We don't really want to know about sharing | ||
260 | // violations here. If the file is locked, then | ||
261 | // the other thread has updated the time for us. | ||
262 | try | 259 | try |
263 | { | 260 | { |
264 | lock (m_CurrentlyWriting) | 261 | File.SetLastAccessTime(filename, DateTime.Now); |
265 | { | ||
266 | if (!m_CurrentlyWriting.Contains(filename)) | ||
267 | File.SetLastAccessTime(filename, DateTime.Now); | ||
268 | } | ||
269 | } | 262 | } |
270 | catch | 263 | catch |
271 | { | 264 | { |