diff options
Diffstat (limited to 'OpenSim/Region/Environment/Modules/World/Archiver/AssetsDearchiver.cs')
-rw-r--r-- | OpenSim/Region/Environment/Modules/World/Archiver/AssetsDearchiver.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/AssetsDearchiver.cs b/OpenSim/Region/Environment/Modules/World/Archiver/AssetsDearchiver.cs index 17abb24..b26fe4c 100644 --- a/OpenSim/Region/Environment/Modules/World/Archiver/AssetsDearchiver.cs +++ b/OpenSim/Region/Environment/Modules/World/Archiver/AssetsDearchiver.cs | |||
@@ -30,7 +30,7 @@ using System.Collections.Generic; | |||
30 | using System.IO; | 30 | using System.IO; |
31 | using System.Reflection; | 31 | using System.Reflection; |
32 | using System.Xml; | 32 | using System.Xml; |
33 | using libsecondlife; | 33 | using OpenMetaverse; |
34 | using log4net; | 34 | using log4net; |
35 | using OpenSim.Framework; | 35 | using OpenSim.Framework; |
36 | using OpenSim.Framework.Communications.Cache; | 36 | using OpenSim.Framework.Communications.Cache; |
@@ -141,7 +141,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver | |||
141 | /// <param name="data"></param> | 141 | /// <param name="data"></param> |
142 | protected void ResolveAssetData(string assetPath, byte[] data) | 142 | protected void ResolveAssetData(string assetPath, byte[] data) |
143 | { | 143 | { |
144 | // Right now we're nastily obtaining the lluuid from the filename | 144 | // Right now we're nastily obtaining the UUID from the filename |
145 | string filename = assetPath.Remove(0, ArchiveConstants.ASSETS_PATH.Length); | 145 | string filename = assetPath.Remove(0, ArchiveConstants.ASSETS_PATH.Length); |
146 | 146 | ||
147 | if (m_metadata.ContainsKey(filename)) | 147 | if (m_metadata.ContainsKey(filename)) |
@@ -156,7 +156,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver | |||
156 | 156 | ||
157 | m_log.DebugFormat("[ARCHIVER]: Importing asset {0}", filename); | 157 | m_log.DebugFormat("[ARCHIVER]: Importing asset {0}", filename); |
158 | 158 | ||
159 | AssetBase asset = new AssetBase(new LLUUID(filename), metadata.Name); | 159 | AssetBase asset = new AssetBase(new UUID(filename), metadata.Name); |
160 | asset.Description = metadata.Description; | 160 | asset.Description = metadata.Description; |
161 | asset.Type = metadata.AssetType; | 161 | asset.Type = metadata.AssetType; |
162 | asset.Data = data; | 162 | asset.Data = data; |