aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Modules/World/Archiver/AssetsArchiver.cs
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-07-21 17:13:32 +0000
committerJustin Clarke Casey2008-07-21 17:13:32 +0000
commita13a4c61448380852df3fba05d2c88710c28e0a9 (patch)
tree1a35bb6bf79dba28b99065e36a82a7050203f11b /OpenSim/Region/Environment/Modules/World/Archiver/AssetsArchiver.cs
parentadded support so that the packet tracker can resend packets itself as well as... (diff)
downloadopensim-SC_OLD-a13a4c61448380852df3fba05d2c88710c28e0a9.zip
opensim-SC_OLD-a13a4c61448380852df3fba05d2c88710c28e0a9.tar.gz
opensim-SC_OLD-a13a4c61448380852df3fba05d2c88710c28e0a9.tar.bz2
opensim-SC_OLD-a13a4c61448380852df3fba05d2c88710c28e0a9.tar.xz
* minor: change misleading 'all assets found' message to instead tell how many were actually located
Diffstat (limited to 'OpenSim/Region/Environment/Modules/World/Archiver/AssetsArchiver.cs')
-rw-r--r--OpenSim/Region/Environment/Modules/World/Archiver/AssetsArchiver.cs23
1 files changed, 8 insertions, 15 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/AssetsArchiver.cs b/OpenSim/Region/Environment/Modules/World/Archiver/AssetsArchiver.cs
index 9a1b560..81d85d2 100644
--- a/OpenSim/Region/Environment/Modules/World/Archiver/AssetsArchiver.cs
+++ b/OpenSim/Region/Environment/Modules/World/Archiver/AssetsArchiver.cs
@@ -121,23 +121,16 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
121 { 121 {
122 AssetBase asset = m_assets[uuid]; 122 AssetBase asset = m_assets[uuid];
123 123
124 if (asset != null) 124 string extension = string.Empty;
125 { 125
126 string extension = string.Empty; 126 if (ArchiveConstants.ASSET_TYPE_TO_EXTENSION.ContainsKey(asset.Type))
127
128 if (ArchiveConstants.ASSET_TYPE_TO_EXTENSION.ContainsKey(asset.Type))
129 {
130 extension = ArchiveConstants.ASSET_TYPE_TO_EXTENSION[asset.Type];
131 }
132
133 archive.AddFile(
134 ArchiveConstants.ASSETS_PATH + uuid.ToString() + extension,
135 asset.Data);
136 }
137 else
138 { 127 {
139 m_log.WarnFormat("[ARCHIVER]: Could not find asset {0} to archive", uuid); 128 extension = ArchiveConstants.ASSET_TYPE_TO_EXTENSION[asset.Type];
140 } 129 }
130
131 archive.AddFile(
132 ArchiveConstants.ASSETS_PATH + uuid.ToString() + extension,
133 asset.Data);
141 } 134 }
142 } 135 }
143 } 136 }