diff options
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs | 24 |
1 files changed, 9 insertions, 15 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs index ad46107..520ea50 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs | |||
@@ -231,24 +231,18 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
231 | 231 | ||
232 | if(curErrorCntr > 0 || possible > 0) | 232 | if(curErrorCntr > 0 || possible > 0) |
233 | { | 233 | { |
234 | string spath; | ||
235 | int indx = path.IndexOf("__"); | ||
236 | if(indx > 0) | ||
237 | spath = path.Substring(0,indx); | ||
238 | else | ||
239 | spath = path; | ||
240 | |||
241 | if(curErrorCntr > 0) | 234 | if(curErrorCntr > 0) |
242 | { | 235 | { |
243 | m_log.ErrorFormat("[INVENTORY ARCHIVER Warning]: item {0} '{1}', type {2}, in '{3}', contains {4} references to missing or damaged assets", | 236 | // path is /name__UUID/name__UUID ... |
244 | inventoryItem.ID, inventoryItem.Name, itemAssetType.ToString(), spath, curErrorCntr); | 237 | m_log.WarnFormat("[INVENTORY ARCHIVER Warning]: item {0} '{1}', type {2}, in '{3}', contains {4} references to missing or damaged assets, or not a problem.", |
245 | if(possible > 0) | 238 | inventoryItem.ID, inventoryItem.Name, itemAssetType.ToString(), path, curErrorCntr); |
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); | 239 | //// if(possible > 0) |
247 | } | 240 | //// m_log.WarnFormat("[INVENTORY ARCHIVER Warning]: item also contains {0} references that may be to missing or damaged assets or not a problem", possible); |
248 | else if(possible > 0) | ||
249 | { | ||
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); | ||
251 | } | 241 | } |
242 | //// else if(possible > 0) | ||
243 | //// { | ||
244 | //// 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); | ||
245 | //// } | ||
252 | } | 246 | } |
253 | } | 247 | } |
254 | } | 248 | } |