From 4ec4e16c809cf86a63b736d2b7b6ad7291595a5f Mon Sep 17 00:00:00 2001 From: Jeff Ames Date: Wed, 4 Jun 2008 09:59:27 +0000 Subject: Formatting cleanup, minor refactoring, svn properties. --- .../Modules/World/Archiver/ArchiveWriteRequest.cs | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequest.cs') diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequest.cs b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequest.cs index 1cc8877..6c341c6 100644 --- a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequest.cs +++ b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequest.cs @@ -80,16 +80,16 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver { // XXX: Not a great way to iterate through face textures, but there's no // other way to tell how many faces there actually are - //int i = 0; - foreach (LLObject.TextureEntryFace texture in part.Shape.Textures.FaceTextures) - { + //int i = 0; + foreach (LLObject.TextureEntryFace texture in part.Shape.Textures.FaceTextures) + { if (texture != null) { - //m_log.DebugFormat("[ARCHIVER]: Got face {0}", i++); + //m_log.DebugFormat("[ARCHIVER]: Got face {0}", i++); textureUuids[texture.TextureID] = 1; } } - + foreach (TaskInventoryItem tit in part.TaskInventory.Values) { if (tit.Type == (int)InventoryType.Texture) @@ -123,7 +123,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver TarArchiveWriter archive = new TarArchiveWriter(); archive.AddFile(ArchiveConstants.PRIMS_PATH, m_serializedEntities); - + // It appears that gtar, at least, doesn't need the intermediate directory entries in the tar //archive.AddDir("assets"); @@ -132,7 +132,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver if (assets[uuid] != null) { archive.AddFile( - ArchiveConstants.TEXTURES_PATH + uuid.ToString() + ArchiveConstants.TEXTURE_EXTENSION, + ArchiveConstants.TEXTURES_PATH + uuid.ToString() + ArchiveConstants.TEXTURE_EXTENSION, assets[uuid].Data); } else @@ -142,7 +142,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver } archive.WriteTar(m_savePath); - + m_log.InfoFormat("[ARCHIVER]: Wrote out OpenSimulator archive {0}", m_savePath); } @@ -232,11 +232,11 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver newThread.Start(); } } - + /// /// Perform the callback on the original requester of the assets /// - protected void PerformAssetsRequestCallback() + protected void PerformAssetsRequestCallback() { m_assetsRequestCallback(m_assets); } -- cgit v1.1