Merge branch 'master' into ubitworkmaster

2014-08-22 01:06:43 +01:00 · 2014-08-22 01:06:43 +01:00 · 9a8d8d2130
parent c95fd60806 4f7acc4c2c
commit 9a8d8d2130
1 changed files with 5 additions and 0 deletions
--- a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
+++ b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
@ -588,6 +588,11 @@ namespace OpenSim.Region.CoreModules.Asset
                        dir, dirSize);
                }
            }
+            catch (DirectoryNotFoundException)
+            {
+                // If we get here, another node on the same box has
+                // already removed the directory. Continue with next.
+            }
            catch (Exception e)
            {
                m_log.Warn(