diff options
author | Dr Scofield | 2009-01-22 16:43:28 +0000 |
---|---|---|
committer | Dr Scofield | 2009-01-22 16:43:28 +0000 |
commit | 20359e8591751089e08915911fc575464e0e726c (patch) | |
tree | 75f5da2e143ec62d3572aacc034e486c20bf5aed /OpenSim/Region/Environment/Modules/Avatar | |
parent | From: Christopher Yeoh <yeohc@au1.ibm.com> (diff) | |
download | opensim-SC_OLD-20359e8591751089e08915911fc575464e0e726c.zip opensim-SC_OLD-20359e8591751089e08915911fc575464e0e726c.tar.gz opensim-SC_OLD-20359e8591751089e08915911fc575464e0e726c.tar.bz2 opensim-SC_OLD-20359e8591751089e08915911fc575464e0e726c.tar.xz |
white space & formatting cleanup
Diffstat (limited to 'OpenSim/Region/Environment/Modules/Avatar')
-rw-r--r-- | OpenSim/Region/Environment/Modules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs b/OpenSim/Region/Environment/Modules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs index e15a232..862caa9 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs +++ b/OpenSim/Region/Environment/Modules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs | |||
@@ -187,13 +187,12 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Inventory.Archiver | |||
187 | new FileStream(loadPath, FileMode.Open), CompressionMode.Decompress)); | 187 | new FileStream(loadPath, FileMode.Open), CompressionMode.Decompress)); |
188 | 188 | ||
189 | byte[] data; | 189 | byte[] data; |
190 | TarArchiveReader.TarEntryType entryType; | 190 | TarArchiveReader.TarEntryType entryType; |
191 | while ((data = archive.ReadEntry(out filePath, out entryType)) != null) | 191 | while ((data = archive.ReadEntry(out filePath, out entryType)) != null) |
192 | { | 192 | { |
193 | if (entryType==TarArchiveReader.TarEntryType.TYPE_DIRECTORY) { | 193 | if (entryType == TarArchiveReader.TarEntryType.TYPE_DIRECTORY) { |
194 | m_log.WarnFormat("[ARCHIVER]: Ignoring directory entry {0}", | 194 | m_log.WarnFormat("[ARCHIVER]: Ignoring directory entry {0}", filePath); |
195 | filePath); | 195 | } else if (filePath.StartsWith(ArchiveConstants.ASSETS_PATH)) |
196 | } else if (filePath.StartsWith(ArchiveConstants.ASSETS_PATH)) | ||
197 | { | 196 | { |
198 | if (LoadAsset(filePath, data)) | 197 | if (LoadAsset(filePath, data)) |
199 | successfulAssetRestores++; | 198 | successfulAssetRestores++; |