1 files changed, 6 insertions, 2 deletions

diff --git a/OpenSim/Region/Environment/Modules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs b/OpenSim/Region/Environment/Modules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
index eab4461..e15a232 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
@@ -187,9 +187,13 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Inventory.Archiver
                     new FileStream(loadPath, FileMode.Open), CompressionMode.Decompress));
 
             byte[] data;
-            while ((data = archive.ReadEntry(out filePath)) != null)
+            TarArchiveReader.TarEntryType entryType;
+            while ((data = archive.ReadEntry(out filePath, out entryType)) != null)
             {
-                if (filePath.StartsWith(ArchiveConstants.ASSETS_PATH))
+                if (entryType==TarArchiveReader.TarEntryType.TYPE_DIRECTORY) {
+                    m_log.WarnFormat("[ARCHIVER]: Ignoring directory entry {0}",
+                                     filePath);
+                } else if (filePath.StartsWith(ArchiveConstants.ASSETS_PATH))
                 {
                     if (LoadAsset(filePath, data))
                         successfulAssetRestores++;