9 files changed, 158 insertions, 158 deletions

diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveConstants.cs b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveConstants.cs
index a5688ef..a76ff0d 100644
--- a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveConstants.cs
+++ b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveConstants.cs
@@ -39,33 +39,33 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
         /// The location of the archive control file
         /// </summary>
         public static readonly string CONTROL_FILE_PATH = "archive.xml";
-        
+
         /// <summary>
         /// Path for the assets held in an archive
         /// </summary>
         public static readonly string ASSETS_PATH = "assets/";
-        
+
         /// <summary>
         /// Path for the assets metadata file
         /// </summary>
         //public static readonly string ASSETS_METADATA_PATH = "assets.xml";
-        
+
         /// <summary>
         /// Path for the prims file
         /// </summary>
         public static readonly string OBJECTS_PATH = "objects/";
-        
+
         /// <summary>
         /// Path for terrains.  Technically these may be assets, but I think it's quite nice to split them out.
         /// </summary>
         public static readonly string TERRAINS_PATH = "terrains/";
-                
+
         /// <summary>
         /// Extensions used for asset types in the archive
         /// </summary>
         public static readonly IDictionary<sbyte, string> ASSET_TYPE_TO_EXTENSION = new Dictionary<sbyte, string>();
         public static readonly IDictionary<string, sbyte> EXTENSION_TO_ASSET_TYPE = new Dictionary<string, sbyte>();
-        
+
         static ArchiveConstants()
         {
             ASSET_TYPE_TO_EXTENSION[(sbyte)AssetType.Animation]           = "_animation.bvh";
@@ -79,11 +79,11 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
             ASSET_TYPE_TO_EXTENSION[(sbyte)AssetType.LostAndFoundFolder]  = "_lostandfoundfolder.txt";   // Not sure if we'll ever see this
             ASSET_TYPE_TO_EXTENSION[(sbyte)AssetType.LSLBytecode]         = "_bytecode.lso";
             ASSET_TYPE_TO_EXTENSION[(sbyte)AssetType.LSLText]             = "_script.lsl";
-            ASSET_TYPE_TO_EXTENSION[(sbyte)AssetType.Notecard]            = "_notecard.txt";            
+            ASSET_TYPE_TO_EXTENSION[(sbyte)AssetType.Notecard]            = "_notecard.txt";
             ASSET_TYPE_TO_EXTENSION[(sbyte)AssetType.Object]              = "_object.xml";
             ASSET_TYPE_TO_EXTENSION[(sbyte)AssetType.RootFolder]          = "_rootfolder.txt";   // Not sure if we'll ever see this
 // disable warning: we know Script is obsolete, but need to support it
-// anyhow 
+// anyhow
 #pragma warning disable 0612
             ASSET_TYPE_TO_EXTENSION[(sbyte)AssetType.Script]              = "_script.txt";   // Not sure if we'll ever see this
 #pragma warning restore 0612
@@ -93,8 +93,8 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
             ASSET_TYPE_TO_EXTENSION[(sbyte)AssetType.SoundWAV]            = "_sound.wav";
             ASSET_TYPE_TO_EXTENSION[(sbyte)AssetType.Texture]             = "_texture.jp2";
             ASSET_TYPE_TO_EXTENSION[(sbyte)AssetType.TextureTGA]          = "_texture.tga";
-            ASSET_TYPE_TO_EXTENSION[(sbyte)AssetType.TrashFolder]         = "_trashfolder.txt";   // Not sure if we'll ever see this                                                            
-            
+            ASSET_TYPE_TO_EXTENSION[(sbyte)AssetType.TrashFolder]         = "_trashfolder.txt";   // Not sure if we'll ever see this
+
             EXTENSION_TO_ASSET_TYPE["_animation.bvh"] = (sbyte)AssetType.Animation;
             EXTENSION_TO_ASSET_TYPE["_bodypart.txt"] = (sbyte)AssetType.Bodypart;
             EXTENSION_TO_ASSET_TYPE["_callingcard.txt"] = (sbyte)AssetType.CallingCard;
@@ -110,7 +110,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
             EXTENSION_TO_ASSET_TYPE["_object.xml"] = (sbyte)AssetType.Object;
             EXTENSION_TO_ASSET_TYPE["_rootfolder.txt"] = (sbyte)AssetType.RootFolder;
 // disable warning: we know Script is obsolete, but need to support it
-// anyhow 
+// anyhow
 #pragma warning disable 0612
             EXTENSION_TO_ASSET_TYPE["_script.txt"] = (sbyte)AssetType.Script;
 #pragma warning restore 0612
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs
index 1340f8b..87106fb 100644
--- a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs
+++ b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs
@@ -53,7 +53,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
 
         private Scene m_scene;
         private string m_loadPath;
-        
+
         /// <summary>
         /// Used to cache lookups for valid uuids.
         /// </summary>
@@ -68,15 +68,15 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
         }
 
         private void DearchiveRegion()
-        {                        
-            TarArchiveReader archive 
+        {
+            TarArchiveReader archive
                 = new TarArchiveReader(
-                    new GZipStream(new FileStream(m_loadPath, FileMode.Open), CompressionMode.Decompress));           
+                    new GZipStream(new FileStream(m_loadPath, FileMode.Open), CompressionMode.Decompress));
             //AssetsDearchiver dearchiver = new AssetsDearchiver(m_scene.AssetCache);
 
             List<string> serialisedSceneObjects = new List<string>();
             string filePath = "ERROR";
-            
+
             int successfulAssetRestores = 0;
             int failedAssetRestores = 0;
 
@@ -111,30 +111,30 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
             //m_log.Debug("[ARCHIVER]: Reached end of archive");
 
             archive.Close();
-            
+
             m_log.InfoFormat("[ARCHIVER]: Restored {0} assets", successfulAssetRestores);
-            
+
             if (failedAssetRestores > 0)
                 m_log.ErrorFormat("[ARCHIVER]: Failed to load {0} assets", failedAssetRestores);
 
-            m_log.Info("[ARCHIVER]: Clearing all existing scene objects");            
+            m_log.Info("[ARCHIVER]: Clearing all existing scene objects");
             m_scene.DeleteAllSceneObjects();
-            
+
             // Reload serialized prims
             m_log.InfoFormat("[ARCHIVER]: Loading {0} scene objects.  Please wait.", serialisedSceneObjects.Count);
 
             IRegionSerialiser serialiser = m_scene.RequestModuleInterface<IRegionSerialiser>();
-            ICollection<SceneObjectGroup> sceneObjects = new List<SceneObjectGroup>();            
+            ICollection<SceneObjectGroup> sceneObjects = new List<SceneObjectGroup>();
 
             foreach (string serialisedSceneObject in serialisedSceneObjects)
-            {             
+            {
                 SceneObjectGroup sceneObject = serialiser.DeserializeGroupFromXml2(serialisedSceneObject);
-                
+
                 // For now, give all incoming scene objects new uuids.  This will allow scenes to be cloned
                 // on the same region server and multiple examples a single object archive to be imported
                 // to the same scene (when this is possible).
                 sceneObject.ResetIDs();
-                
+
                 // Try to retain the original creator/owner/lastowner if their uuid is present on this grid
                 // otherwise, use the master avatar uuid instead
                 LLUUID masterAvatarId = m_scene.RegionInfo.MasterAvatarAssignedUUID;
@@ -144,41 +144,41 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
                 {
                     if (!resolveUserUuid(part.CreatorID))
                         part.CreatorID = masterAvatarId;
-                    
+
                     if (!resolveUserUuid(part.OwnerID))
                         part.OwnerID = masterAvatarId;
-                    
+
                     if (!resolveUserUuid(part.LastOwnerID))
-                        part.LastOwnerID = masterAvatarId;   
-                    
+                        part.LastOwnerID = masterAvatarId;
+
                     // And zap any troublesome sit target information
                     part.SitTargetOrientation = new Quaternion(0,0,0,1);
                     part.SitTargetPosition    = new Vector3(0,0,0);
-                }                 
-                
+                }
+
                 if (m_scene.AddRestoredSceneObject(sceneObject, true, false))
-                {                        
+                {
                     sceneObjects.Add(sceneObject);
                 }
-            }            
-            
+            }
+
             m_log.InfoFormat("[ARCHIVER]: Restored {0} scene objects to the scene", sceneObjects.Count);
-            
+
             int ignoredObjects = serialisedSceneObjects.Count - sceneObjects.Count;
-            
+
             if (ignoredObjects > 0)
                 m_log.WarnFormat("[ARCHIVER]: Ignored {0} scene objects that already existed in the scene", ignoredObjects);
-                                 
+
             m_log.InfoFormat("[ARCHIVER]: Successfully loaded archive");
-            
+
             m_log.Debug("[ARCHIVER]: Starting scripts");
-            
+
             foreach (SceneObjectGroup sceneObject in sceneObjects)
             {
                 sceneObject.CreateScriptInstances(0, true);
-            }            
+            }
         }
-        
+
         /// <summary>
         /// Look up the given user id to check whether it's one that is valid for this grid.
         /// </summary>
@@ -194,13 +194,13 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
                 else
                     m_validUserUuids.Add(uuid, false);
             }
-            
+
             if (m_validUserUuids[uuid])
                 return true;
             else
-                return false;          
+                return false;
         }
-    
+
         /// <summary>
         /// Load an asset
         /// </summary>
@@ -212,20 +212,20 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
             // Right now we're nastily obtaining the lluuid from the filename
             string filename = assetPath.Remove(0, ArchiveConstants.ASSETS_PATH.Length);
             string extension = filename.Substring(filename.LastIndexOf("_"));
-            string uuid = filename.Remove(filename.Length - extension.Length);        
-                    
+            string uuid = filename.Remove(filename.Length - extension.Length);
+
             if (ArchiveConstants.EXTENSION_TO_ASSET_TYPE.ContainsKey(extension))
             {
                 sbyte assetType = ArchiveConstants.EXTENSION_TO_ASSET_TYPE[extension];
-    
+
                 //m_log.DebugFormat("[ARCHIVER]: Importing asset {0}, type {1}", uuid, assetType);
-    
+
                 AssetBase asset = new AssetBase(new LLUUID(uuid), String.Empty);
                 asset.Type = assetType;
                 asset.Data = data;
-    
+
                 m_scene.AssetCache.AddAsset(asset);
-                
+
                 return true;
             }
             else
@@ -233,11 +233,11 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
                 m_log.ErrorFormat(
                     "[ARCHIVER]: Tried to dearchive data with path {0} with an unknown type extension {1}",
                     assetPath, extension);
-                
+
                 return false;
             }
         }
-        
+
         /// <summary>
         /// Load terrain data
         /// </summary>
@@ -249,13 +249,13 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
         private bool LoadTerrain(string terrainPath, byte[] data)
         {
             ITerrainModule terrainModule = m_scene.RequestModuleInterface<ITerrainModule>();
-            
+
             MemoryStream ms = new MemoryStream(data);
             terrainModule.LoadFromStream(terrainPath, ms);
             ms.Close();
-            
+
             m_log.DebugFormat("[ARCHIVER]: Restored terrain {0}", terrainPath);
-            
+
             return true;
         }
     }
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestExecution.cs b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestExecution.cs
index 0341a70..26d4797 100644
--- a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestExecution.cs
+++ b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestExecution.cs
@@ -61,8 +61,8 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
 
         public ArchiveWriteRequestExecution(
              List<SceneObjectGroup> sceneObjects,
-             ITerrainModule terrainModule,                               
-             IRegionSerialiser serialiser, 
+             ITerrainModule terrainModule,
+             IRegionSerialiser serialiser,
              string sceneName,
              string savePath)
         {
@@ -79,37 +79,37 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
             {
                 m_log.DebugFormat("[ARCHIVER]: Could not find asset {0}", uuid);
             }
-            
+
             m_log.InfoFormat(
                 "[ARCHIVER]: Received {0} of {1} assets requested", assetsFound.Count, assetsFound.Count + assetsNotFoundUuids.Count);
 
             TarArchiveWriter archive = new TarArchiveWriter();
-            
+
             // Write out control file
             archive.AddFile(ArchiveConstants.CONTROL_FILE_PATH, CreateControlFile());
-            
+
             // Write out terrain
             string terrainPath = String.Format("{0}{1}.r32", ArchiveConstants.TERRAINS_PATH, m_sceneName);
-            MemoryStream ms = new MemoryStream();            
+            MemoryStream ms = new MemoryStream();
             m_terrainModule.SaveToStream(terrainPath, ms);
-            archive.AddFile(terrainPath, ms.ToArray());           
+            archive.AddFile(terrainPath, ms.ToArray());
             ms.Close();
-            
+
             // Write out scene object metadata
             foreach (SceneObjectGroup sceneObject in m_sceneObjects)
             {
                 //m_log.DebugFormat("[ARCHIVER]: Saving {0} {1}, {2}", entity.Name, entity.UUID, entity.GetType());
-                
+
                 LLVector3 position = sceneObject.AbsolutePosition;
-                
+
                 string serializedObject = m_serialiser.SaveGroupToXml2(sceneObject);
-                string filename 
+                string filename
                     = string.Format(
                         "{0}{1}_{2:000}-{3:000}-{4:000}__{5}.xml",
-                        ArchiveConstants.OBJECTS_PATH, sceneObject.Name, 
-                        Math.Round(position.X), Math.Round(position.Y), Math.Round(position.Z), 
+                        ArchiveConstants.OBJECTS_PATH, sceneObject.Name,
+                        Math.Round(position.X), Math.Round(position.Y), Math.Round(position.Z),
                         sceneObject.UUID);
-                
+
                 archive.AddFile(filename, serializedObject);
             }
 
@@ -120,8 +120,8 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
             archive.WriteTar(new GZipStream(new FileStream(m_savePath, FileMode.Create), CompressionMode.Compress));
 
             m_log.InfoFormat("[ARCHIVER]: Wrote out OpenSimulator archive {0}", m_savePath);
-        }   
-        
+        }
+
         /// <summary>
         /// Create the control file for this archive
         /// </summary>
@@ -136,13 +136,13 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
             xtw.WriteAttributeString("major_version", "0");
             xtw.WriteAttributeString("minor_version", "1");
             xtw.WriteEndElement();
-            
+
             xtw.Flush();
             xtw.Close();
-            
+
             String s = sw.ToString();
             sw.Close();
-            
+
             return s;
         }
     }
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestPreparation.cs b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestPreparation.cs
index 327808a..20e15ab 100644
--- a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestPreparation.cs
+++ b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestPreparation.cs
@@ -52,14 +52,14 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
 
         protected Scene m_scene;
         protected string m_savePath;
-        
+
         /// <summary>
         /// Used for identifying uuids embedded in scripts
         /// </summary>
-        protected static readonly Regex m_uuidRegex 
+        protected static readonly Regex m_uuidRegex
             = new Regex(
-                "[0-9a-eA-E]{8}-[0-9a-eA-E]{4}-[0-9a-eA-E]{4}-[0-9a-eA-E]{4}-[0-9a-eA-E]{12}", 
-                RegexOptions.Compiled);        
+                "[0-9a-eA-E]{8}-[0-9a-eA-E]{4}-[0-9a-eA-E]{4}-[0-9a-eA-E]{4}-[0-9a-eA-E]{12}",
+                RegexOptions.Compiled);
 
         /// <summary>
         /// Used as a temporary store of an asset which represents an object.  This can be a null if no appropriate
@@ -93,9 +93,9 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
                 Monitor.Pulse(this);
             }
         }
-        
+
         /// <summary>
-        /// Get an asset synchronously, potentially using an asynchronous callback.  If the 
+        /// Get an asset synchronously, potentially using an asynchronous callback.  If the
         /// asynchronous callback is used, we will wait for it to complete.
         /// </summary>
         /// <param name="uuid"></param>
@@ -118,11 +118,11 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
                     Monitor.Wait(this);
                     m_waitingForObjectAsset = false;
                 }
-            }          
-            
+            }
+
             return m_requestedObjectAsset;
         }
-        
+
         /// <summary>
         /// Record the asset uuids embedded within the given script.
         /// </summary>
@@ -138,16 +138,16 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
                 //m_log.DebugFormat("[ARCHIVER]: Script {0}", script);
                 MatchCollection uuidMatches = m_uuidRegex.Matches(script);
                 //m_log.DebugFormat("[ARCHIVER]: Found {0} matches in script", uuidMatches.Count);
-                
+
                 foreach (Match uuidMatch in uuidMatches)
                 {
                     LLUUID uuid = new LLUUID(uuidMatch.Value);
                     //m_log.DebugFormat("[ARCHIVER]: Recording {0} in script", uuid);
                     assetUuids[uuid] = 1;
                 }
-            }                         
+            }
         }
-        
+
         /// <summary>
         /// Record the uuids referenced by the given wearable asset
         /// </summary>
@@ -159,25 +159,25 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
             //m_log.Debug(new System.Text.ASCIIEncoding().GetString(bodypartAsset.Data));
             AssetWearable wearableAsset = new AssetBodypart(assetBase.Data);
             wearableAsset.Decode();
-            
+
             //m_log.DebugFormat(
             //    "[ARCHIVER]: Wearable asset {0} references {1} assets", wearableAssetUuid, wearableAsset.Textures.Count);
-            
+
             foreach (LLUUID uuid in wearableAsset.Textures.Values)
             {
                 //m_log.DebugFormat("[ARCHIVER]: Got bodypart uuid {0}", uuid);
                 assetUuids[uuid] = 1;
             }
         }
-        
+
         /// <summary>
         /// Get all the asset uuids associated with a given object.  This includes both those directly associated with
         /// it (e.g. face textures) and recursively, those of items within it's inventory (e.g. objects contained
         /// within this object).
         /// </summary>
         /// <param name="sceneObject"></param>
-        /// <param name="assetUuids"></param>        
-        protected void GetSceneObjectAssetUuids(LLUUID sceneObjectUuid, IDictionary<LLUUID, int> assetUuids)   
+        /// <param name="assetUuids"></param>
+        protected void GetSceneObjectAssetUuids(LLUUID sceneObjectUuid, IDictionary<LLUUID, int> assetUuids)
         {
             AssetBase objectAsset = GetAsset(sceneObjectUuid);
 
@@ -186,7 +186,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
                 string xml = Helpers.FieldToUTF8String(objectAsset.Data);
                 SceneObjectGroup sog = new SceneObjectGroup(m_scene, m_scene.RegionInfo.RegionHandle, xml);
                 GetSceneObjectAssetUuids(sog, assetUuids);
-            }            
+            }
         }
 
         /// <summary>
@@ -209,10 +209,10 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
                 try
                 {
                     LLObject.TextureEntry textureEntry = part.Shape.Textures;
-    
+
                     // Get the prim's default texture.  This will be used for faces which don't have their own texture
                     assetUuids[textureEntry.DefaultTexture.TextureID] = 1;
-    
+
                     // XXX: Not a great way to iterate through face textures, but there's no
                     // other method available to tell how many faces there actually are
                     //int i = 0;
@@ -224,15 +224,15 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
                             assetUuids[texture.TextureID] = 1;
                         }
                     }
-                    
+
                     foreach (TaskInventoryItem tii in part.TaskInventory.Values)
                     {
                         //m_log.DebugFormat("[ARCHIVER]: Analysing item asset type {0}", tii.Type);
-                        
+
                         if (!assetUuids.ContainsKey(tii.AssetID))
                         {
                             assetUuids[tii.AssetID] = 1;
-    
+
                             if ((int)AssetType.Bodypart == tii.Type || ((int)AssetType.Clothing == tii.Type))
                             {
                                 GetWearableAssetUuids(tii.AssetID, assetUuids);
@@ -275,20 +275,20 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
                 if (entity is SceneObjectGroup)
                     sceneObjects.Add((SceneObjectGroup)entity);
             }
-            
+
             foreach (SceneObjectGroup sceneObject in sceneObjects)
             {
                 GetSceneObjectAssetUuids(sceneObject, assetUuids);
             }
 
             m_log.DebugFormat(
-                "[ARCHIVER]: {0} scene objects to serialize requiring save of {1} assets", 
+                "[ARCHIVER]: {0} scene objects to serialize requiring save of {1} assets",
                 sceneObjects.Count, assetUuids.Count);
 
             // Asynchronously request all the assets required to perform this archive operation
-            ArchiveWriteRequestExecution awre 
+            ArchiveWriteRequestExecution awre
                 = new ArchiveWriteRequestExecution(
-                    sceneObjects, 
+                    sceneObjects,
                     m_scene.RequestModuleInterface<ITerrainModule>(),
                     m_scene.RequestModuleInterface<IRegionSerialiser>(),
                     m_scene.RegionInfo.RegionName,
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/AssetsArchiver.cs b/OpenSim/Region/Environment/Modules/World/Archiver/AssetsArchiver.cs
index 2704224..708bed3 100644
--- a/OpenSim/Region/Environment/Modules/World/Archiver/AssetsArchiver.cs
+++ b/OpenSim/Region/Environment/Modules/World/Archiver/AssetsArchiver.cs
@@ -41,17 +41,17 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
     public class AssetsArchiver
     {
         // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        
+
         /// <summary>
         /// Archive assets
         /// </summary>
         protected IDictionary<LLUUID, AssetBase> m_assets;
-        
+
         public AssetsArchiver(IDictionary<LLUUID, AssetBase> assets)
         {
             m_assets = assets;
         }
-        
+
         /// <summary>
         /// Archive the assets given to this archiver to the given archive.
         /// </summary>
@@ -70,44 +70,44 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
         {
             StringWriter sw = new StringWriter();
             XmlTextWriter xtw = new XmlTextWriter(sw);
-            
+
             xtw.Formatting = Formatting.Indented;
             xtw.WriteStartDocument();
-            
+
             xtw.WriteStartElement("assets");
-            
+
             foreach (LLUUID uuid in m_assets.Keys)
             {
                 AssetBase asset = m_assets[uuid];
-                
+
                 if (asset != null)
                 {
                     xtw.WriteStartElement("asset");
-                    
+
                     string extension = string.Empty;
-                    
+
                     if (ArchiveConstants.ASSET_TYPE_TO_EXTENSION.ContainsKey(asset.Type))
                     {
                         extension = ArchiveConstants.ASSET_TYPE_TO_EXTENSION[asset.Type];
-                    }                    
-                    
+                    }
+
                     xtw.WriteElementString("filename", uuid.ToString() + extension);
-                    
+
                     xtw.WriteElementString("name", asset.Name);
                     xtw.WriteElementString("description", asset.Description);
                     xtw.WriteElementString("asset-type", asset.Type.ToString());
-                    
+
                     xtw.WriteEndElement();
                 }
             }
-            
+
             xtw.WriteEndElement();
-            
+
             xtw.WriteEndDocument();
-            
+
             archive.AddFile("assets.xml", sw.ToString());
         }
-        
+
         /// <summary>
         /// Write asset data files to the given archive
         /// </summary>
@@ -116,18 +116,18 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
         {
             // It appears that gtar, at least, doesn't need the intermediate directory entries in the tar
             //archive.AddDir("assets");
-            
+
             foreach (LLUUID uuid in m_assets.Keys)
             {
                 AssetBase asset = m_assets[uuid];
-                
+
                 string extension = string.Empty;
-                
+
                 if (ArchiveConstants.ASSET_TYPE_TO_EXTENSION.ContainsKey(asset.Type))
                 {
                     extension = ArchiveConstants.ASSET_TYPE_TO_EXTENSION[asset.Type];
                 }
-                
+
                 archive.AddFile(
                     ArchiveConstants.ASSETS_PATH + uuid.ToString() + extension,
                     asset.Data);
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/AssetsDearchiver.cs b/OpenSim/Region/Environment/Modules/World/Archiver/AssetsDearchiver.cs
index 284a39e..17abb24 100644
--- a/OpenSim/Region/Environment/Modules/World/Archiver/AssetsDearchiver.cs
+++ b/OpenSim/Region/Environment/Modules/World/Archiver/AssetsDearchiver.cs
@@ -43,9 +43,9 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
     public class AssetsDearchiver
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        
+
         protected static System.Text.ASCIIEncoding m_asciiEncoding = new System.Text.ASCIIEncoding();
-        
+
         /// <summary>
         /// Store for asset data we received before we get the metadata
         /// </summary>
@@ -55,17 +55,17 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
         /// Asset metadata.  Is null if asset metadata isn't yet available.
         /// </summary>
         protected Dictionary<string, AssetMetadata> m_metadata;
-        
+
         /// <summary>
         /// Cache to which dearchived assets will be added
         /// </summary>
         protected AssetCache m_cache;
-        
+
         public AssetsDearchiver(AssetCache cache)
         {
             m_cache = cache;
         }
-        
+
         /// <summary>
         /// Add asset data to the dearchiver
         /// </summary>
@@ -82,7 +82,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
                 ResolveAssetData(assetFilename, data);
             }
         }
-        
+
         /// <summary>
         /// Add asset metadata xml
         /// </summary>
@@ -90,39 +90,39 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
         public void AddAssetMetadata(string xml)
         {
             m_metadata = new Dictionary<string, AssetMetadata>();
-            
+
             StringReader sr = new StringReader(xml);
             XmlTextReader reader = new XmlTextReader(sr);
-            
+
             reader.ReadStartElement("assets");
             reader.Read();
-            
+
             while (reader.Name.Equals("asset"))
             {
                 reader.Read();
-                
+
                 AssetMetadata metadata = new AssetMetadata();
-                
+
                 string filename = reader.ReadElementString("filename");
                 m_log.DebugFormat("[DEARCHIVER]: Reading node {0}", filename);
-                
+
                 metadata.Name = reader.ReadElementString("name");
                 metadata.Description = reader.ReadElementString("description");
                 metadata.AssetType = Convert.ToSByte(reader.ReadElementString("asset-type"));
-                
+
                 m_metadata[filename] = metadata;
-                
+
                 // Read asset end tag
                 reader.ReadEndElement();
-                
+
                 reader.Read();
             }
-            
+
             m_log.DebugFormat("[DEARCHIVER]: Resolved {0} items of asset metadata", m_metadata.Count);
-            
+
             ResolvePendingAssetData();
         }
-        
+
         /// <summary>
         /// Resolve asset data that we collected before receiving the metadata
         /// </summary>
@@ -133,7 +133,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
                 ResolveAssetData(filename, m_assetDataAwaitingMetadata[filename]);
             }
         }
-        
+
         /// <summary>
         /// Resolve a new piece of asset data against stored metadata
         /// </summary>
@@ -143,11 +143,11 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
         {
             // Right now we're nastily obtaining the lluuid from the filename
             string filename = assetPath.Remove(0, ArchiveConstants.ASSETS_PATH.Length);
-            
+
             if (m_metadata.ContainsKey(filename))
             {
                 AssetMetadata metadata = m_metadata[filename];
-                
+
                 if (ArchiveConstants.ASSET_TYPE_TO_EXTENSION.ContainsKey(metadata.AssetType))
                 {
                     string extension = ArchiveConstants.ASSET_TYPE_TO_EXTENSION[metadata.AssetType];
@@ -166,11 +166,11 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
             else
             {
                 m_log.ErrorFormat(
-                    "[DEARCHIVER]: Tried to dearchive data with filename {0} without any corresponding metadata", 
+                    "[DEARCHIVER]: Tried to dearchive data with filename {0} without any corresponding metadata",
                     assetPath);
             }
         }
-        
+
         /// <summary>
         /// Metadata for an asset
         /// </summary>
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/AssetsRequest.cs b/OpenSim/Region/Environment/Modules/World/Archiver/AssetsRequest.cs
index 6ffbcbb..2164f7e 100644
--- a/OpenSim/Region/Environment/Modules/World/Archiver/AssetsRequest.cs
+++ b/OpenSim/Region/Environment/Modules/World/Archiver/AssetsRequest.cs
@@ -43,12 +43,12 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
     class AssetsRequest
     {
         //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        
+
         /// <summary>
         /// uuids to request
         /// </summary>
         protected ICollection<LLUUID> m_uuids;
-        
+
         /// <summary>
         /// Callback used when all the assets requested have been received.
         /// </summary>
@@ -58,7 +58,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
         /// Assets retrieved in this request
         /// </summary>
         protected Dictionary<LLUUID, AssetBase> m_assets = new Dictionary<LLUUID, AssetBase>();
-        
+
         /// <summary>
         /// Maintain a list of assets that could not be found.  This will be passed back to the requester.
         /// </summary>
@@ -81,7 +81,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
             m_assetCache = assetCache;
             m_repliesRequired = uuids.Count;
         }
-        
+
         protected internal void Execute()
         {
             // We can stop here if there are no assets to fetch
@@ -105,7 +105,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
                 m_assets[assetID] = asset;
             else
                 m_notFoundAssetUuids.Add(assetID);
-            
+
             //m_log.DebugFormat(
             //    "[ARCHIVER]: Received {0} assets and notification of {1} missing assets", m_assets.Count, m_notFoundAssetUuids.Count);
 
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/TarArchiveReader.cs b/OpenSim/Region/Environment/Modules/World/Archiver/TarArchiveReader.cs
index 585d1d4..4e000cc 100644
--- a/OpenSim/Region/Environment/Modules/World/Archiver/TarArchiveReader.cs
+++ b/OpenSim/Region/Environment/Modules/World/Archiver/TarArchiveReader.cs
@@ -69,9 +69,9 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
         public byte[] ReadEntry(out string filePath)
         {
             filePath = String.Empty;
-            
+
             TarHeader header = ReadHeader();
-            
+
             if (null == header)
                 return null;
 
@@ -98,14 +98,14 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
         /// </summary>
         /// <returns>A tar header struct.  null if we have reached the end of the archive.</returns>
         protected TarHeader ReadHeader()
-        {            
+        {
             byte[] header = m_br.ReadBytes(512);
-            
+
             // If we've reached the end of the archive we'll be in null block territory, which means
-            // the next byte will be 0            
+            // the next byte will be 0
             if (header[0] == 0)
                 return null;
-            
+
             TarHeader tarHeader = new TarHeader();
 
             tarHeader.FilePath = m_asciiEncoding.GetString(header, 0, 100);
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/TarArchiveWriter.cs b/OpenSim/Region/Environment/Modules/World/Archiver/TarArchiveWriter.cs
index f70a93d..83b9250 100644
--- a/OpenSim/Region/Environment/Modules/World/Archiver/TarArchiveWriter.cs
+++ b/OpenSim/Region/Environment/Modules/World/Archiver/TarArchiveWriter.cs
@@ -54,10 +54,10 @@ namespace OpenSim.Region.Environment
             // Directories are signalled by a final /
             if (!dirName.EndsWith("/"))
                 dirName += "/";
-            
+
             AddFile(dirName, new byte[0]);
         }
-        
+
         /// <summary>
         /// Add a file to the tar archive
         /// </summary>
@@ -161,7 +161,7 @@ namespace OpenSim.Region.Environment
                 if (data.Length % 512 != 0)
                 {
                     int paddingRequired = 512 - (data.Length % 512);
-                    
+
                     //m_log.DebugFormat("[TAR ARCHIVE WRITER]: Padding data with {0} bytes", paddingRequired);
 
                     byte[] padding = new byte[paddingRequired];