Merge commit 'f16d125027aba098e45dc026f9d507a430bc2b10' into bigmerge

avinationmerge
Melanie 2011-10-25 03:17:26 +01:00
commit e058b0822f
1 changed files with 2 additions and 2 deletions

View File

@ -132,7 +132,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
{ {
m_requestState = RequestState.Running; m_requestState = RequestState.Running;
m_log.DebugFormat("[ARCHIVER]: AssetsRequest executed looking for {0} assets", m_repliesRequired); m_log.DebugFormat("[ARCHIVER]: AssetsRequest executed looking for {0} possible assets", m_repliesRequired);
// We can stop here if there are no assets to fetch // We can stop here if there are no assets to fetch
if (m_repliesRequired == 0) if (m_repliesRequired == 0)
@ -267,7 +267,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
m_requestState = RequestState.Completed; m_requestState = RequestState.Completed;
m_log.DebugFormat( m_log.DebugFormat(
"[ARCHIVER]: Successfully added {0} assets ({1} assets notified missing)", "[ARCHIVER]: Successfully added {0} assets ({1} assets not found but these may be expected invalid references)",
m_foundAssetUuids.Count, m_notFoundAssetUuids.Count); m_foundAssetUuids.Count, m_notFoundAssetUuids.Count);
// We want to stop using the asset cache thread asap // We want to stop using the asset cache thread asap