aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Asset
diff options
context:
space:
mode:
authorMelanie Thielker2014-08-18 17:14:51 +0200
committerMelanie Thielker2014-08-18 17:14:51 +0200
commit4f7acc4c2c70cf07ad1ce7f4c304ba5edea98105 (patch)
treec162d0d78c42599ec35ef7139719e754c6f157de /OpenSim/Region/CoreModules/Asset
parent try external bakedModule when local cache is invalid and not just at login (diff)
downloadopensim-SC_OLD-4f7acc4c2c70cf07ad1ce7f4c304ba5edea98105.zip
opensim-SC_OLD-4f7acc4c2c70cf07ad1ce7f4c304ba5edea98105.tar.gz
opensim-SC_OLD-4f7acc4c2c70cf07ad1ce7f4c304ba5edea98105.tar.bz2
opensim-SC_OLD-4f7acc4c2c70cf07ad1ce7f4c304ba5edea98105.tar.xz
Expect a missing directory, the asset cache is shared. Prevent spew if
two nodes run cleanup at the same time.
Diffstat (limited to 'OpenSim/Region/CoreModules/Asset')
-rw-r--r--OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs5
1 files changed, 5 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
index b270de9..5468cdc 100644
--- a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
+++ b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
@@ -588,6 +588,11 @@ namespace OpenSim.Region.CoreModules.Asset
588 dir, dirSize); 588 dir, dirSize);
589 } 589 }
590 } 590 }
591 catch (DirectoryNotFoundException)
592 {
593 // If we get here, another node on the same box has
594 // already removed the directory. Continue with next.
595 }
591 catch (Exception e) 596 catch (Exception e)
592 { 597 {
593 m_log.Warn( 598 m_log.Warn(