From f8beeb1e93daf2aba2892339ba284dad9ccff906 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Wed, 15 Dec 2010 08:15:12 +0100
Subject: Fix casts in llSetPayPrice

---
 OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Region/CoreModules')

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
                     // If the file is already cached, don't cache it, just touch it so access time is updated
                     if (File.Exists(filename))
                     {
-                        File.SetLastAccessTime(filename, DateTime.Now);
+                        // We don't really want to know about sharing
+                        // violations here. If the file is locked, then
+                        // the other thread has updated the time for us.
+                        try
+                        {
+                            File.SetLastAccessTime(filename, DateTime.Now);
+                        }
+                        catch
+                        {
+                        }
                     } else { 
                         
                         // Once we start writing, make sure we flag that we're writing
-- 
cgit v1.1