aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs')
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs14
1 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
index 4ad9974..8dec2c4 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
@@ -35,7 +35,7 @@ using System.Xml;
35using log4net; 35using log4net;
36using OpenMetaverse; 36using OpenMetaverse;
37using OpenSim.Framework; 37using OpenSim.Framework;
38using OpenSim.Framework.Archive; 38using OpenSim.Framework.Serialization;
39using OpenSim.Framework.Communications; 39using OpenSim.Framework.Communications;
40using OpenSim.Framework.Communications.Cache; 40using OpenSim.Framework.Communications.Cache;
41using OpenSim.Region.CoreModules.World.Archiver; 41using OpenSim.Region.CoreModules.World.Archiver;
@@ -208,19 +208,19 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
208 failedAssetRestores++; 208 failedAssetRestores++;
209 } 209 }
210 else if (filePath.StartsWith(ArchiveConstants.INVENTORY_PATH)) 210 else if (filePath.StartsWith(ArchiveConstants.INVENTORY_PATH))
211 { 211 {
212 string fsPath = filePath.Substring(ArchiveConstants.INVENTORY_PATH.Length); 212 string fsPath = filePath.Substring(ArchiveConstants.INVENTORY_PATH.Length);
213 213
214 // Remove the file portion if we aren't already dealing with a directory path 214 // Remove the file portion if we aren't already dealing with a directory path
215 if (TarArchiveReader.TarEntryType.TYPE_DIRECTORY != entryType) 215 if (TarArchiveReader.TarEntryType.TYPE_DIRECTORY != entryType)
216 fsPath = fsPath.Remove(fsPath.LastIndexOf("/") + 1); 216 fsPath = fsPath.Remove(fsPath.LastIndexOf("/") + 1);
217 217
218 string originalFsPath = fsPath; 218 string originalFsPath = fsPath;
219 219
220 m_log.DebugFormat("[INVENTORY ARCHIVER]: Loading to folder {0}", fsPath); 220 m_log.DebugFormat("[INVENTORY ARCHIVER]: Loading to folder {0}", fsPath);
221 221
222 InventoryFolderImpl foundFolder = null; 222 InventoryFolderImpl foundFolder = null;
223 223
224 // XXX: Nasty way of dealing with a path that has no directory component 224 // XXX: Nasty way of dealing with a path that has no directory component
225 if (fsPath.Length > 0) 225 if (fsPath.Length > 0)
226 { 226 {
@@ -323,15 +323,15 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
323 if (TarArchiveReader.TarEntryType.TYPE_DIRECTORY != entryType) 323 if (TarArchiveReader.TarEntryType.TYPE_DIRECTORY != entryType)
324 { 324 {
325 InventoryItemBase item = LoadInvItem(m_asciiEncoding.GetString(data)); 325 InventoryItemBase item = LoadInvItem(m_asciiEncoding.GetString(data));
326 326
327 if (item != null) 327 if (item != null)
328 { 328 {
329 // Don't use the item ID that's in the file 329 // Don't use the item ID that's in the file
330 item.ID = UUID.Random(); 330 item.ID = UUID.Random();
331 331
332 item.Creator = m_userInfo.UserProfile.ID; 332 item.Creator = m_userInfo.UserProfile.ID;
333 item.Owner = m_userInfo.UserProfile.ID; 333 item.Owner = m_userInfo.UserProfile.ID;
334 334
335 // Reset folder ID to the one in which we want to load it 335 // Reset folder ID to the one in which we want to load it
336 item.Folder = foundFolder.ID; 336 item.Folder = foundFolder.ID;
337 337