diff options
Diffstat (limited to 'OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs')
-rw-r--r-- | OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs index 89f5fd7..776ea78 100644 --- a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs +++ b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs | |||
@@ -31,13 +31,12 @@ using OpenSim.Region.Environment.Modules.World.Serialiser; | |||
31 | using OpenSim.Region.Environment.Modules.World.Terrain; | 31 | using OpenSim.Region.Environment.Modules.World.Terrain; |
32 | using OpenSim.Framework.Communications.Cache; | 32 | using OpenSim.Framework.Communications.Cache; |
33 | using System; | 33 | using System; |
34 | using Axiom.Math; | ||
35 | using System.Collections.Generic; | 34 | using System.Collections.Generic; |
36 | using System.IO; | 35 | using System.IO; |
37 | using System.IO.Compression; | 36 | using System.IO.Compression; |
38 | using System.Reflection; | 37 | using System.Reflection; |
39 | using System.Xml; | 38 | using System.Xml; |
40 | using libsecondlife; | 39 | using OpenMetaverse; |
41 | using log4net; | 40 | using log4net; |
42 | 41 | ||
43 | namespace OpenSim.Region.Environment.Modules.World.Archiver | 42 | namespace OpenSim.Region.Environment.Modules.World.Archiver |
@@ -57,7 +56,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver | |||
57 | /// <summary> | 56 | /// <summary> |
58 | /// Used to cache lookups for valid uuids. | 57 | /// Used to cache lookups for valid uuids. |
59 | /// </summary> | 58 | /// </summary> |
60 | private IDictionary<LLUUID, bool> m_validUserUuids = new Dictionary<LLUUID, bool>(); | 59 | private IDictionary<UUID, bool> m_validUserUuids = new Dictionary<UUID, bool>(); |
61 | 60 | ||
62 | public ArchiveReadRequest(Scene scene, string loadPath) | 61 | public ArchiveReadRequest(Scene scene, string loadPath) |
63 | { | 62 | { |
@@ -137,8 +136,8 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver | |||
137 | 136 | ||
138 | // Try to retain the original creator/owner/lastowner if their uuid is present on this grid | 137 | // Try to retain the original creator/owner/lastowner if their uuid is present on this grid |
139 | // otherwise, use the master avatar uuid instead | 138 | // otherwise, use the master avatar uuid instead |
140 | LLUUID masterAvatarId = m_scene.RegionInfo.MasterAvatarAssignedUUID; | 139 | UUID masterAvatarId = m_scene.RegionInfo.MasterAvatarAssignedUUID; |
141 | if (m_scene.RegionInfo.EstateSettings.EstateOwner != LLUUID.Zero) | 140 | if (m_scene.RegionInfo.EstateSettings.EstateOwner != UUID.Zero) |
142 | masterAvatarId = m_scene.RegionInfo.EstateSettings.EstateOwner; | 141 | masterAvatarId = m_scene.RegionInfo.EstateSettings.EstateOwner; |
143 | foreach (SceneObjectPart part in sceneObject.Children.Values) | 142 | foreach (SceneObjectPart part in sceneObject.Children.Values) |
144 | { | 143 | { |
@@ -184,7 +183,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver | |||
184 | /// </summary> | 183 | /// </summary> |
185 | /// <param name="uuid"></param> | 184 | /// <param name="uuid"></param> |
186 | /// <returns></returns> | 185 | /// <returns></returns> |
187 | private bool resolveUserUuid(LLUUID uuid) | 186 | private bool resolveUserUuid(UUID uuid) |
188 | { | 187 | { |
189 | if (!m_validUserUuids.ContainsKey(uuid)) | 188 | if (!m_validUserUuids.ContainsKey(uuid)) |
190 | { | 189 | { |
@@ -209,7 +208,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver | |||
209 | /// <returns>true if asset was successfully loaded, false otherwise</returns> | 208 | /// <returns>true if asset was successfully loaded, false otherwise</returns> |
210 | private bool LoadAsset(string assetPath, byte[] data) | 209 | private bool LoadAsset(string assetPath, byte[] data) |
211 | { | 210 | { |
212 | // Right now we're nastily obtaining the lluuid from the filename | 211 | // Right now we're nastily obtaining the UUID from the filename |
213 | string filename = assetPath.Remove(0, ArchiveConstants.ASSETS_PATH.Length); | 212 | string filename = assetPath.Remove(0, ArchiveConstants.ASSETS_PATH.Length); |
214 | int i = filename.LastIndexOf(ArchiveConstants.ASSET_EXTENSION_SEPARATOR); | 213 | int i = filename.LastIndexOf(ArchiveConstants.ASSET_EXTENSION_SEPARATOR); |
215 | 214 | ||
@@ -231,7 +230,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver | |||
231 | 230 | ||
232 | //m_log.DebugFormat("[ARCHIVER]: Importing asset {0}, type {1}", uuid, assetType); | 231 | //m_log.DebugFormat("[ARCHIVER]: Importing asset {0}, type {1}", uuid, assetType); |
233 | 232 | ||
234 | AssetBase asset = new AssetBase(new LLUUID(uuid), String.Empty); | 233 | AssetBase asset = new AssetBase(new UUID(uuid), String.Empty); |
235 | asset.Type = assetType; | 234 | asset.Type = assetType; |
236 | asset.Data = data; | 235 | asset.Data = data; |
237 | 236 | ||