diff options
author | Justin Clark-Casey (justincc) | 2010-06-18 17:37:28 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2010-06-18 17:37:28 +0100 |
commit | 71c8bbaf2c768167e377e86ae7137a86c0bb36d0 (patch) | |
tree | 356e0a08c2066e659330b6341e56a6eaa2555a27 /OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs | |
parent | change TestPartExistingIarPath() to check appropriate folder creation (diff) | |
download | opensim-SC_OLD-71c8bbaf2c768167e377e86ae7137a86c0bb36d0.zip opensim-SC_OLD-71c8bbaf2c768167e377e86ae7137a86c0bb36d0.tar.gz opensim-SC_OLD-71c8bbaf2c768167e377e86ae7137a86c0bb36d0.tar.bz2 opensim-SC_OLD-71c8bbaf2c768167e377e86ae7137a86c0bb36d0.tar.xz |
Fix problem where iar load would duplicate huge number of folders
This was http://opensimulator.org/mantis/view.php?id=4770
Extend unit tests to check for this scenario too
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs index 94c6ef9..9996074 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs | |||
@@ -246,9 +246,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
246 | InventoryFolderBase rootDestFolder, | 246 | InventoryFolderBase rootDestFolder, |
247 | ref string archivePath, | 247 | ref string archivePath, |
248 | Dictionary <string, InventoryFolderBase> resolvedFolders) | 248 | Dictionary <string, InventoryFolderBase> resolvedFolders) |
249 | { | 249 | { |
250 | m_log.DebugFormat("[INVENTORY ARCHIVER]: Resolving destination folder {0}", archivePath); | ||
251 | |||
252 | string originalArchivePath = archivePath; | 250 | string originalArchivePath = archivePath; |
253 | 251 | ||
254 | InventoryFolderBase destFolder = null; | 252 | InventoryFolderBase destFolder = null; |
@@ -257,6 +255,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
257 | { | 255 | { |
258 | while (null == destFolder && archivePath.Length > 0) | 256 | while (null == destFolder && archivePath.Length > 0) |
259 | { | 257 | { |
258 | m_log.DebugFormat("[INVENTORY ARCHIVER]: Trying to resolve destination folder {0}", archivePath); | ||
259 | |||
260 | if (resolvedFolders.ContainsKey(archivePath)) | 260 | if (resolvedFolders.ContainsKey(archivePath)) |
261 | { | 261 | { |
262 | m_log.DebugFormat( | 262 | m_log.DebugFormat( |