diff options
| author | Melanie | 2013-02-16 05:37:12 +0000 |
|---|---|---|
| committer | Melanie | 2013-02-16 05:37:12 +0000 |
| commit | 192e1e7cf0aec73dc20db40196cd6d2f25578bfb (patch) | |
| tree | a4f580faa970039cb90bdca0e92a7d6b155a8276 /OpenSim/Region/CoreModules/World/Archiver | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Separate IAR tests into separate files for load/save/loadpath tests (diff) | |
| download | opensim-SC_OLD-192e1e7cf0aec73dc20db40196cd6d2f25578bfb.zip opensim-SC_OLD-192e1e7cf0aec73dc20db40196cd6d2f25578bfb.tar.gz opensim-SC_OLD-192e1e7cf0aec73dc20db40196cd6d2f25578bfb.tar.bz2 opensim-SC_OLD-192e1e7cf0aec73dc20db40196cd6d2f25578bfb.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Archiver')
| -rw-r--r-- | OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs index 715bf51..ada7ecc 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs | |||
| @@ -156,6 +156,8 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
| 156 | 156 | ||
| 157 | foreach (KeyValuePair<UUID, AssetType> kvp in m_uuids) | 157 | foreach (KeyValuePair<UUID, AssetType> kvp in m_uuids) |
| 158 | { | 158 | { |
| 159 | // m_log.DebugFormat("[ARCHIVER]: Requesting asset {0}", kvp.Key); | ||
| 160 | |||
| 159 | // m_assetService.Get(kvp.Key.ToString(), kvp.Value, PreAssetRequestCallback); | 161 | // m_assetService.Get(kvp.Key.ToString(), kvp.Value, PreAssetRequestCallback); |
| 160 | AssetBase asset = m_assetService.Get(kvp.Key.ToString()); | 162 | AssetBase asset = m_assetService.Get(kvp.Key.ToString()); |
| 161 | PreAssetRequestCallback(kvp.Key.ToString(), kvp.Value, asset); | 163 | PreAssetRequestCallback(kvp.Key.ToString(), kvp.Value, asset); |