diff options
author | Melanie | 2010-12-15 08:15:12 +0100 |
---|---|---|
committer | Melanie | 2010-12-15 08:15:12 +0100 |
commit | f8beeb1e93daf2aba2892339ba284dad9ccff906 (patch) | |
tree | 03d3d5d0887514a64cef56e9b34af94eb909e8be /OpenSim/Region/CoreModules/Asset | |
parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
download | opensim-SC-f8beeb1e93daf2aba2892339ba284dad9ccff906.zip opensim-SC-f8beeb1e93daf2aba2892339ba284dad9ccff906.tar.gz opensim-SC-f8beeb1e93daf2aba2892339ba284dad9ccff906.tar.bz2 opensim-SC-f8beeb1e93daf2aba2892339ba284dad9ccff906.tar.xz |
Fix casts in llSetPayPrice
Diffstat (limited to 'OpenSim/Region/CoreModules/Asset')
-rw-r--r-- | OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs index 6ed4867..e542d7d 100644 --- a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs +++ b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs | |||
@@ -271,7 +271,16 @@ namespace Flotsam.RegionModules.AssetCache | |||
271 | // If the file is already cached, don't cache it, just touch it so access time is updated | 271 | // If the file is already cached, don't cache it, just touch it so access time is updated |
272 | if (File.Exists(filename)) | 272 | if (File.Exists(filename)) |
273 | { | 273 | { |
274 | File.SetLastAccessTime(filename, DateTime.Now); | 274 | // We don't really want to know about sharing |
275 | // violations here. If the file is locked, then | ||
276 | // the other thread has updated the time for us. | ||
277 | try | ||
278 | { | ||
279 | File.SetLastAccessTime(filename, DateTime.Now); | ||
280 | } | ||
281 | catch | ||
282 | { | ||
283 | } | ||
275 | } else { | 284 | } else { |
276 | 285 | ||
277 | // Once we start writing, make sure we flag that we're writing | 286 | // Once we start writing, make sure we flag that we're writing |