diff options
author | John Hurliman | 2009-10-19 15:19:37 -0700 |
---|---|---|
committer | John Hurliman | 2009-10-19 15:19:37 -0700 |
commit | bd03cbd8156e2044eed89ba2774bab43b9931aa1 (patch) | |
tree | c6dc15d4028b2d103b89296ac68b84482b77f5e8 /OpenSim/Region/CoreModules | |
parent | * Change Util.FireAndForget to use ThreadPool.UnsafeQueueUserWorkItem(). This... (diff) | |
parent | Minor formatting cleanup. (diff) | |
download | opensim-SC_OLD-bd03cbd8156e2044eed89ba2774bab43b9931aa1.zip opensim-SC_OLD-bd03cbd8156e2044eed89ba2774bab43b9931aa1.tar.gz opensim-SC_OLD-bd03cbd8156e2044eed89ba2774bab43b9931aa1.tar.bz2 opensim-SC_OLD-bd03cbd8156e2044eed89ba2774bab43b9931aa1.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into prioritization
Diffstat (limited to 'OpenSim/Region/CoreModules')
-rw-r--r-- | OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs index 4041b63..5ca4178 100644 --- a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs +++ b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs | |||
@@ -730,7 +730,7 @@ namespace Flotsam.RegionModules.AssetCache | |||
730 | int fileCount = GetFileCacheCount(m_CacheDirectory); | 730 | int fileCount = GetFileCacheCount(m_CacheDirectory); |
731 | m_log.InfoFormat("[FLOTSAM ASSET CACHE] File Cache : {0} assets", fileCount); | 731 | m_log.InfoFormat("[FLOTSAM ASSET CACHE] File Cache : {0} assets", fileCount); |
732 | 732 | ||
733 | foreach ( string s in Directory.GetFiles(m_CacheDirectory, "*.fac" ) ) | 733 | foreach (string s in Directory.GetFiles(m_CacheDirectory, "*.fac")) |
734 | { | 734 | { |
735 | m_log.Info("[FLOTSAM ASSET CACHE] Deep Scans were performed on the following regions:"); | 735 | m_log.Info("[FLOTSAM ASSET CACHE] Deep Scans were performed on the following regions:"); |
736 | 736 | ||
@@ -770,7 +770,7 @@ namespace Flotsam.RegionModules.AssetCache | |||
770 | int assetsCached = CacheScenes(); | 770 | int assetsCached = CacheScenes(); |
771 | m_log.InfoFormat("[FLOTSAM ASSET CACHE] Completed Scene Caching, {0} assets found.", assetsCached); | 771 | m_log.InfoFormat("[FLOTSAM ASSET CACHE] Completed Scene Caching, {0} assets found.", assetsCached); |
772 | 772 | ||
773 | }); | 773 | }); |
774 | 774 | ||
775 | break; | 775 | break; |
776 | 776 | ||