diff options
Diffstat (limited to 'OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs')
-rw-r--r-- | OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs | 7 |
1 files changed, 3 insertions, 4 deletions
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 | |||
75 | { | 75 | { |
76 | serializedPrims = m_asciiEncoding.GetString(data); | 76 | serializedPrims = m_asciiEncoding.GetString(data); |
77 | } | 77 | } |
78 | else if (filePath.StartsWith(ArchiveConstants.ASSETS_PATH)) | 78 | else if (filePath.StartsWith(ArchiveConstants.TEXTURES_PATH)) |
79 | { | 79 | { |
80 | // Right now we're nastily obtaining the lluuid from the filename | 80 | // Right now we're nastily obtaining the lluuid from the filename |
81 | string rawId = filePath.Remove(0, ArchiveConstants.ASSETS_PATH.Length); | 81 | string rawId = filePath.Remove(0, ArchiveConstants.TEXTURES_PATH.Length); |
82 | rawId = rawId.Remove(rawId.Length - ArchiveConstants.TEXTURE_EXTENSION.Length); | 82 | rawId = rawId.Remove(rawId.Length - ArchiveConstants.TEXTURE_EXTENSION.Length); |
83 | 83 | ||
84 | m_log.DebugFormat("[ARCHIVER]: Importing asset {0}", rawId); | 84 | m_log.DebugFormat("[ARCHIVER]: Importing asset {0}", rawId); |
@@ -86,8 +86,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver | |||
86 | // Not preserving asset name or description as of yet | 86 | // Not preserving asset name or description as of yet |
87 | AssetBase asset = new AssetBase(new LLUUID(rawId), "imported name"); | 87 | AssetBase asset = new AssetBase(new LLUUID(rawId), "imported name"); |
88 | asset.Description = "imported description"; | 88 | asset.Description = "imported description"; |
89 | 89 | ||
90 | // Only importing textures right now | ||
91 | asset.Type = (sbyte)AssetType.Texture; | 90 | asset.Type = (sbyte)AssetType.Texture; |
92 | asset.InvType = (sbyte)InventoryType.Texture; | 91 | asset.InvType = (sbyte)InventoryType.Texture; |
93 | 92 | ||