Rename OpenSim.Framework.Archive to OpenSim.Framework.Serialization

Update using statements and prebuild.xml. Also trim trailing whitespace.

3 files changed, 9 insertions, 9 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;
 using log4net;
 using OpenMetaverse;
 using OpenSim.Framework;
-using OpenSim.Framework.Archive;
+using OpenSim.Framework.Serialization;
 using OpenSim.Framework.Communications;
 using OpenSim.Framework.Communications.Cache;
 using OpenSim.Region.CoreModules.World.Archiver;
@@ -208,19 +208,19 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                         failedAssetRestores++;
                 }
                 else if (filePath.StartsWith(ArchiveConstants.INVENTORY_PATH))
-                {                    
+                {
                     string fsPath = filePath.Substring(ArchiveConstants.INVENTORY_PATH.Length);
 
                     // Remove the file portion if we aren't already dealing with a directory path
                     if (TarArchiveReader.TarEntryType.TYPE_DIRECTORY != entryType)
                         fsPath = fsPath.Remove(fsPath.LastIndexOf("/") + 1);
-                    
+
                     string originalFsPath = fsPath;
 
                     m_log.DebugFormat("[INVENTORY ARCHIVER]: Loading to folder {0}", fsPath);
 
                     InventoryFolderImpl foundFolder = null;
-                    
+
                     // XXX: Nasty way of dealing with a path that has no directory component
                     if (fsPath.Length > 0)
                     {
@@ -323,15 +323,15 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                     if (TarArchiveReader.TarEntryType.TYPE_DIRECTORY != entryType)
                     {
                         InventoryItemBase item = LoadInvItem(m_asciiEncoding.GetString(data));
-                        
+
                         if (item != null)
-                        {      
+                        {
                             // Don't use the item ID that's in the file
                             item.ID = UUID.Random();
 
                             item.Creator = m_userInfo.UserProfile.ID;
                             item.Owner = m_userInfo.UserProfile.ID;
-                            
+
                             // Reset folder ID to the one in which we want to load it
                             item.Folder = foundFolder.ID;
 
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs
index 364dc28..460fbf5 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs
@@ -34,7 +34,7 @@ using System.Xml;
 using log4net;
 using OpenMetaverse;
 using OpenSim.Framework;
-using OpenSim.Framework.Archive;
+using OpenSim.Framework.Serialization;
 using OpenSim.Framework.Communications;
 using OpenSim.Framework.Communications.Cache;
 using OpenSim.Region.CoreModules.World.Archiver;
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
index ea72f08..bd8d325 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
@@ -34,7 +34,7 @@ using NUnit.Framework.SyntaxHelpers;
 using OpenMetaverse;
 using OpenSim.Data;
 using OpenSim.Framework;
-using OpenSim.Framework.Archive;
+using OpenSim.Framework.Serialization;
 using OpenSim.Framework.Communications;
 using OpenSim.Framework.Communications.Cache;
 using OpenSim.Region.CoreModules.Avatar.Inventory.Archiver;