diff options
author | Justin Clarke Casey | 2009-03-13 20:46:53 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2009-03-13 20:46:53 +0000 |
commit | c04e7cdf2b8f95534dafe7faedb29e1ff1af36c8 (patch) | |
tree | fc5a72b39ba72eee84afba4dc9ff315acbb0096f /OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs | |
parent | * Remove asset cache size and texture stat reports from ASSET STATS since the... (diff) | |
download | opensim-SC_OLD-c04e7cdf2b8f95534dafe7faedb29e1ff1af36c8.zip opensim-SC_OLD-c04e7cdf2b8f95534dafe7faedb29e1ff1af36c8.tar.gz opensim-SC_OLD-c04e7cdf2b8f95534dafe7faedb29e1ff1af36c8.tar.bz2 opensim-SC_OLD-c04e7cdf2b8f95534dafe7faedb29e1ff1af36c8.tar.xz |
* Support loading empty folders in an iar
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs index 076fbce..0a0bb4c 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs | |||
@@ -83,6 +83,8 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
83 | 83 | ||
84 | protected internal void Execute() | 84 | protected internal void Execute() |
85 | { | 85 | { |
86 | m_log.DebugFormat("[ARCHIVER]: AssetsRequest executed looking for {0} assets", m_repliesRequired); | ||
87 | |||
86 | // We can stop here if there are no assets to fetch | 88 | // We can stop here if there are no assets to fetch |
87 | if (m_repliesRequired == 0) | 89 | if (m_repliesRequired == 0) |
88 | m_assetsRequestCallback(m_assets, m_notFoundAssetUuids); | 90 | m_assetsRequestCallback(m_assets, m_notFoundAssetUuids); |
@@ -100,6 +102,8 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
100 | /// <param name="asset"></param> | 102 | /// <param name="asset"></param> |
101 | public void AssetRequestCallback(UUID assetID, AssetBase asset) | 103 | public void AssetRequestCallback(UUID assetID, AssetBase asset) |
102 | { | 104 | { |
105 | //m_log.DebugFormat("[ARCHIVER]: Received callback for asset {0}", assetID); | ||
106 | |||
103 | if (asset != null) | 107 | if (asset != null) |
104 | { | 108 | { |
105 | m_assetCache.ExpireAsset(assetID); | 109 | m_assetCache.ExpireAsset(assetID); |
@@ -110,11 +114,12 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
110 | m_notFoundAssetUuids.Add(assetID); | 114 | m_notFoundAssetUuids.Add(assetID); |
111 | } | 115 | } |
112 | 116 | ||
113 | //m_log.DebugFormat( | ||
114 | // "[ARCHIVER]: Received {0} assets and notification of {1} missing assets", m_assets.Count, m_notFoundAssetUuids.Count); | ||
115 | |||
116 | if (m_assets.Count + m_notFoundAssetUuids.Count == m_repliesRequired) | 117 | if (m_assets.Count + m_notFoundAssetUuids.Count == m_repliesRequired) |
117 | { | 118 | { |
119 | m_log.DebugFormat( | ||
120 | "[ARCHIVER]: Successfully received {0} assets and notification of {1} missing assets", | ||
121 | m_assets.Count, m_notFoundAssetUuids.Count); | ||
122 | |||
118 | // We want to stop using the asset cache thread asap as we now need to do the actual work of producing the archive | 123 | // We want to stop using the asset cache thread asap as we now need to do the actual work of producing the archive |
119 | Thread newThread = new Thread(PerformAssetsRequestCallback); | 124 | Thread newThread = new Thread(PerformAssetsRequestCallback); |
120 | newThread.Name = "OpenSimulator archiving thread post assets receipt"; | 125 | newThread.Name = "OpenSimulator archiving thread post assets receipt"; |