Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into prioritization

This commit is contained in:
John Hurliman
2009-10-19 15:19:37 -07:00
16 changed files with 86 additions and 68 deletions

View File

@@ -730,7 +730,7 @@ namespace Flotsam.RegionModules.AssetCache
int fileCount = GetFileCacheCount(m_CacheDirectory);
m_log.InfoFormat("[FLOTSAM ASSET CACHE] File Cache : {0} assets", fileCount);
foreach ( string s in Directory.GetFiles(m_CacheDirectory, "*.fac" ) )
foreach (string s in Directory.GetFiles(m_CacheDirectory, "*.fac"))
{
m_log.Info("[FLOTSAM ASSET CACHE] Deep Scans were performed on the following regions:");
@@ -770,7 +770,7 @@ namespace Flotsam.RegionModules.AssetCache
int assetsCached = CacheScenes();
m_log.InfoFormat("[FLOTSAM ASSET CACHE] Completed Scene Caching, {0} assets found.", assetsCached);
});
});
break;