diff options
| author | UbitUmarov | 2015-09-01 14:54:35 +0100 |
|---|---|---|
| committer | UbitUmarov | 2015-09-01 14:54:35 +0100 |
| commit | 371c9dd2af01a2e7422ec901ee1f80757284a78c (patch) | |
| tree | 058d2a513cacb12efcce0c0df0ae14ad135dbfe2 /OpenSim/Region/CoreModules/Asset | |
| parent | remove lixo (diff) | |
| parent | dont change camera on crossings (diff) | |
| download | opensim-SC_OLD-371c9dd2af01a2e7422ec901ee1f80757284a78c.zip opensim-SC_OLD-371c9dd2af01a2e7422ec901ee1f80757284a78c.tar.gz opensim-SC_OLD-371c9dd2af01a2e7422ec901ee1f80757284a78c.tar.bz2 opensim-SC_OLD-371c9dd2af01a2e7422ec901ee1f80757284a78c.tar.xz | |
bad merge?
Diffstat (limited to 'OpenSim/Region/CoreModules/Asset')
| -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 7d9c9a9..c4abc99 100644 --- a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs +++ b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs | |||
| @@ -594,6 +594,11 @@ namespace OpenSim.Region.CoreModules.Asset | |||
| 594 | dir, dirSize); | 594 | dir, dirSize); |
| 595 | } | 595 | } |
| 596 | } | 596 | } |
| 597 | catch (DirectoryNotFoundException) | ||
| 598 | { | ||
| 599 | // If we get here, another node on the same box has | ||
| 600 | // already removed the directory. Continue with next. | ||
| 601 | } | ||
| 597 | catch (Exception e) | 602 | catch (Exception e) |
| 598 | { | 603 | { |
| 599 | m_log.Warn( | 604 | m_log.Warn( |