Merge branch 'master' into ubitworkmaster

avinationmerge
UbitUmarov 2014-08-22 01:06:43 +01:00
commit 9a8d8d2130
1 changed files with 5 additions and 0 deletions

View File

@ -588,6 +588,11 @@ namespace OpenSim.Region.CoreModules.Asset
dir, dirSize); 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) catch (Exception e)
{ {
m_log.Warn( m_log.Warn(