From 4106b2a60104fcecfe2c603c99b0aa3f8947e1ee Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Tue, 3 Jun 2008 16:52:44 +0000
Subject: * Change single assets/ archiver directory to be textures/ instead

---
 .../Region/Environment/Modules/World/Archiver/ArchiveConstants.cs  | 2 +-
 .../Environment/Modules/World/Archiver/ArchiveReadRequest.cs       | 7 +++----
 .../Environment/Modules/World/Archiver/ArchiveWriteRequest.cs      | 2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveConstants.cs b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveConstants.cs
index faffa2b..bfe635d 100644
--- a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveConstants.cs
+++ b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveConstants.cs
@@ -35,7 +35,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
         /// <summary>
         /// Path for the assets held in an archive
         /// </summary>
-        public static readonly string ASSETS_PATH = "assets/";
+        public static readonly string TEXTURES_PATH = "textures/";
         
         /// <summary>
         /// Extension used for texture assets in archive
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs
index a4e1627..0c5edaa 100644
--- a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs
+++ b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs
@@ -75,10 +75,10 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
                 {
                     serializedPrims = m_asciiEncoding.GetString(data);
                 }
-                else if (filePath.StartsWith(ArchiveConstants.ASSETS_PATH))
+                else if (filePath.StartsWith(ArchiveConstants.TEXTURES_PATH))
                 {
                     // Right now we're nastily obtaining the lluuid from the filename
-                    string rawId = filePath.Remove(0, ArchiveConstants.ASSETS_PATH.Length); 
+                    string rawId = filePath.Remove(0, ArchiveConstants.TEXTURES_PATH.Length); 
                     rawId = rawId.Remove(rawId.Length - ArchiveConstants.TEXTURE_EXTENSION.Length);
                     
                     m_log.DebugFormat("[ARCHIVER]: Importing asset {0}", rawId);
@@ -86,8 +86,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
                     // Not preserving asset name or description as of yet
                     AssetBase asset = new AssetBase(new LLUUID(rawId), "imported name");
                     asset.Description = "imported description";
-                    
-                    // Only importing textures right now
+                      
                     asset.Type = (sbyte)AssetType.Texture;
                     asset.InvType = (sbyte)InventoryType.Texture;
                     
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequest.cs b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequest.cs
index 935a17f..41bde40 100644
--- a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequest.cs
+++ b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequest.cs
@@ -123,7 +123,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
                 if (assets[uuid] != null)
                 {
                     archive.AddFile(
-                        ArchiveConstants.ASSETS_PATH + uuid.ToString() + ArchiveConstants.TEXTURE_EXTENSION, 
+                        ArchiveConstants.TEXTURES_PATH + uuid.ToString() + ArchiveConstants.TEXTURE_EXTENSION, 
                         assets[uuid].Data);
                 }
                 else
-- 
cgit v1.1