diff options
author | Justin Clark-Casey (justincc) | 2010-08-28 02:40:21 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2010-08-28 02:40:21 +0100 |
commit | def6b1544f51300fcc051bd975df138b23ed2fc7 (patch) | |
tree | b72fe33f99cbe5105fddd7d0de82b59e6b266a41 /OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs | |
parent | Improve liveness by operating on list copies of SOG.Children where appropriate (diff) | |
download | opensim-SC_OLD-def6b1544f51300fcc051bd975df138b23ed2fc7.zip opensim-SC_OLD-def6b1544f51300fcc051bd975df138b23ed2fc7.tar.gz opensim-SC_OLD-def6b1544f51300fcc051bd975df138b23ed2fc7.tar.bz2 opensim-SC_OLD-def6b1544f51300fcc051bd975df138b23ed2fc7.tar.xz |
very minor log message and var name tweaking for iar saving
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs index 25a78ff..9908018 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs | |||
@@ -221,7 +221,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
221 | InventoryItemBase inventoryItem = null; | 221 | InventoryItemBase inventoryItem = null; |
222 | InventoryFolderBase rootFolder = m_scene.InventoryService.GetRootFolder(m_userInfo.PrincipalID); | 222 | InventoryFolderBase rootFolder = m_scene.InventoryService.GetRootFolder(m_userInfo.PrincipalID); |
223 | 223 | ||
224 | bool foundStar = false; | 224 | bool saveFolderContentsOnly = false; |
225 | 225 | ||
226 | // Eliminate double slashes and any leading / on the path. | 226 | // Eliminate double slashes and any leading / on the path. |
227 | string[] components | 227 | string[] components |
@@ -234,7 +234,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
234 | // folder itself. This may get more sophisicated later on | 234 | // folder itself. This may get more sophisicated later on |
235 | if (maxComponentIndex >= 0 && components[maxComponentIndex] == STAR_WILDCARD) | 235 | if (maxComponentIndex >= 0 && components[maxComponentIndex] == STAR_WILDCARD) |
236 | { | 236 | { |
237 | foundStar = true; | 237 | saveFolderContentsOnly = true; |
238 | maxComponentIndex--; | 238 | maxComponentIndex--; |
239 | } | 239 | } |
240 | 240 | ||
@@ -281,10 +281,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
281 | { | 281 | { |
282 | m_log.DebugFormat( | 282 | m_log.DebugFormat( |
283 | "[INVENTORY ARCHIVER]: Found folder {0} {1} at {2}", | 283 | "[INVENTORY ARCHIVER]: Found folder {0} {1} at {2}", |
284 | inventoryFolder.Name, inventoryFolder.ID, m_invPath); | 284 | inventoryFolder.Name, |
285 | inventoryFolder.ID, | ||
286 | m_invPath == String.Empty ? InventoryFolderImpl.PATH_DELIMITER : m_invPath ); | ||
285 | 287 | ||
286 | //recurse through all dirs getting dirs and files | 288 | //recurse through all dirs getting dirs and files |
287 | SaveInvFolder(inventoryFolder, ArchiveConstants.INVENTORY_PATH, !foundStar); | 289 | SaveInvFolder(inventoryFolder, ArchiveConstants.INVENTORY_PATH, !saveFolderContentsOnly); |
288 | } | 290 | } |
289 | else if (inventoryItem != null) | 291 | else if (inventoryItem != null) |
290 | { | 292 | { |