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 --- .../Environment/Modules/World/Archiver/ArchiveReadRequest.cs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs') 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; -- cgit v1.1