diff options
| author | UbitUmarov | 2014-08-22 01:06:43 +0100 |
|---|---|---|
| committer | UbitUmarov | 2014-08-22 01:06:43 +0100 |
| commit | 9a8d8d213015b644f32d0cbdb8c3331c07d86d40 (patch) | |
| tree | 9f62dd32cf75a9067b8b61e9d1ffd499cae9a915 | |
| parent | revert the kills, they seem even worse (diff) | |
| parent | Expect a missing directory, the asset cache is shared. Prevent spew if (diff) | |
| download | opensim-SC-9a8d8d213015b644f32d0cbdb8c3331c07d86d40.zip opensim-SC-9a8d8d213015b644f32d0cbdb8c3331c07d86d40.tar.gz opensim-SC-9a8d8d213015b644f32d0cbdb8c3331c07d86d40.tar.bz2 opensim-SC-9a8d8d213015b644f32d0cbdb8c3331c07d86d40.tar.xz | |
Merge branch 'master' into ubitworkmaster
| -rw-r--r-- | OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs | 5 |
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( |