diff options
a few more changes to iar/oar assets save error/warning to show problems known to be asset errors
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs index d816ba4..ad46107 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs | |||
@@ -223,10 +223,13 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
223 | if (SaveAssets && itemAssetType != AssetType.Link && itemAssetType != AssetType.LinkFolder) | 223 | if (SaveAssets && itemAssetType != AssetType.Link && itemAssetType != AssetType.LinkFolder) |
224 | { | 224 | { |
225 | int curErrorCntr = m_assetGatherer.ErrorCount; | 225 | int curErrorCntr = m_assetGatherer.ErrorCount; |
226 | int possible = m_assetGatherer.possibleNotAssetCount; | ||
226 | m_assetGatherer.AddForInspection(inventoryItem.AssetID); | 227 | m_assetGatherer.AddForInspection(inventoryItem.AssetID); |
227 | m_assetGatherer.GatherAll(); | 228 | m_assetGatherer.GatherAll(); |
228 | curErrorCntr = m_assetGatherer.ErrorCount - curErrorCntr; | 229 | curErrorCntr = m_assetGatherer.ErrorCount - curErrorCntr; |
229 | if(curErrorCntr > 0) | 230 | possible = m_assetGatherer.possibleNotAssetCount - possible; |
231 | |||
232 | if(curErrorCntr > 0 || possible > 0) | ||
230 | { | 233 | { |
231 | string spath; | 234 | string spath; |
232 | int indx = path.IndexOf("__"); | 235 | int indx = path.IndexOf("__"); |
@@ -235,15 +238,16 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
235 | else | 238 | else |
236 | spath = path; | 239 | spath = path; |
237 | 240 | ||
238 | if(curErrorCntr > 1) | 241 | if(curErrorCntr > 0) |
239 | { | 242 | { |
240 | m_log.WarnFormat("[INVENTORY ARCHIVER Warning]: item {0} '{1}', type {2}, in '{3}', contains {4} references to possible missing or damaged assets )", | 243 | m_log.ErrorFormat("[INVENTORY ARCHIVER Warning]: item {0} '{1}', type {2}, in '{3}', contains {4} references to missing or damaged assets", |
241 | inventoryItem.ID, inventoryItem.Name, itemAssetType.ToString(), spath, curErrorCntr); | 244 | inventoryItem.ID, inventoryItem.Name, itemAssetType.ToString(), spath, curErrorCntr); |
245 | if(possible > 0) | ||
246 | m_log.WarnFormat("[INVENTORY ARCHIVER Warning]: item also contains {0} references that may be to missing or damaged assets or not a problem", possible); | ||
242 | } | 247 | } |
243 | else if(curErrorCntr == 1) | 248 | else if(possible > 0) |
244 | { | 249 | { |
245 | m_log.WarnFormat("[INVENTORY ARCHIVER Warning]: item {0} '{1}', type {2}, in '{3}', contains a reference to a possible missing or damaged asset)", | 250 | m_log.WarnFormat("[INVENTORY ARCHIVER Warning]: item {0} '{1}', type {2}, in '{3}', contains {4} references that may be to missing or damaged assets or not a problem", inventoryItem.ID, inventoryItem.Name, itemAssetType.ToString(), spath, possible); |
246 | inventoryItem.ID, inventoryItem.Name, itemAssetType.ToString(), spath); | ||
247 | } | 251 | } |
248 | } | 252 | } |
249 | } | 253 | } |