From 5910a49da6e16d6e3718fffad73c8a24efcec80d Mon Sep 17 00:00:00 2001 From: Jeff Ames Date: Tue, 10 Jun 2008 08:35:46 +0000 Subject: Update svn properties. Formatting cleanup. --- .../Environment/Modules/World/Archiver/AssetsArchiver.cs | 13 ++++++------- .../Environment/Modules/World/Archiver/AssetsDearchiver.cs | 12 ++++++------ 2 files changed, 12 insertions(+), 13 deletions(-) (limited to 'OpenSim/Region/Environment/Modules/World/Archiver') diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/AssetsArchiver.cs b/OpenSim/Region/Environment/Modules/World/Archiver/AssetsArchiver.cs index 2a041dd..4f4a3c3 100644 --- a/OpenSim/Region/Environment/Modules/World/Archiver/AssetsArchiver.cs +++ b/OpenSim/Region/Environment/Modules/World/Archiver/AssetsArchiver.cs @@ -1,4 +1,4 @@ -/* +/* * Copyright (c) Contributors, http://opensimulator.org/ * See CONTRIBUTORS.TXT for a full list of copyright holders. * @@ -40,7 +40,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver /// public class AssetsArchiver { - private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); + private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); /// /// Archive assets @@ -99,15 +99,14 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver xtw.WriteElementString("inventory-type", asset.InvType.ToString()); xtw.WriteEndElement(); - } - + } } xtw.WriteEndElement(); xtw.WriteEndDocument(); - archive.AddFile("assets.xml", sw.ToString()); + archive.AddFile("assets.xml", sw.ToString()); } /// @@ -118,7 +117,7 @@ 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]; @@ -140,7 +139,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver { m_log.DebugFormat("[ARCHIVER]: Could not find asset {0} to archive", uuid); } - } + } } } } diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/AssetsDearchiver.cs b/OpenSim/Region/Environment/Modules/World/Archiver/AssetsDearchiver.cs index 15a92e5..98364d3 100644 --- a/OpenSim/Region/Environment/Modules/World/Archiver/AssetsDearchiver.cs +++ b/OpenSim/Region/Environment/Modules/World/Archiver/AssetsDearchiver.cs @@ -39,7 +39,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver { /// /// Dearchives assets - /// + /// public class AssetsDearchiver { private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); @@ -61,7 +61,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver /// protected AssetCache m_cache; - public AssetsDearchiver(AssetCache cache) + public AssetsDearchiver(AssetCache cache) { m_cache = cache; } @@ -82,7 +82,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver ResolveAssetData(assetFilename, data); } } - + /// /// Add asset metadata xml /// @@ -92,7 +92,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver m_metadata = new Dictionary(); StringReader sr = new StringReader(xml); - XmlTextReader reader = new XmlTextReader(sr); + XmlTextReader reader = new XmlTextReader(sr); reader.ReadStartElement("assets"); reader.Read(); @@ -109,7 +109,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver metadata.Name = reader.ReadElementString("name"); metadata.Description = reader.ReadElementString("description"); metadata.AssetType = Convert.ToSByte(reader.ReadElementString("asset-type")); - metadata.AssetType = Convert.ToSByte(reader.ReadElementString("inventory-type")); + metadata.AssetType = Convert.ToSByte(reader.ReadElementString("inventory-type")); m_metadata[filename] = metadata; @@ -131,7 +131,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver { foreach (string filename in m_assetDataAwaitingMetadata.Keys) { - ResolveAssetData(filename, m_assetDataAwaitingMetadata[filename]); + ResolveAssetData(filename, m_assetDataAwaitingMetadata[filename]); } } -- cgit v1.1