From 7d89e122930be39e84a6d174548fa2d12ac0484a Mon Sep 17 00:00:00 2001
From: Teravus Ovares
Date: Sat, 6 Sep 2008 07:52:41 +0000
Subject: * This is the fabled LibOMV update with all of the libOMV types from
JHurliman * This is a HUGE OMG update and will definitely have unknown side
effects.. so this is really only for the strong hearted at this point.
Regular people should let the dust settle. * This has been tested to work
with most basic functions. However.. make sure you back up 'everything'
before using this. It's that big! * Essentially we're back at square 1 in
the testing phase.. so lets identify things that broke.
---
.../Modules/World/Archiver/ArchiveReadRequest.cs | 15 +++++++--------
1 file changed, 7 insertions(+), 8 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 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;
using OpenSim.Region.Environment.Modules.World.Terrain;
using OpenSim.Framework.Communications.Cache;
using System;
-using Axiom.Math;
using System.Collections.Generic;
using System.IO;
using System.IO.Compression;
using System.Reflection;
using System.Xml;
-using libsecondlife;
+using OpenMetaverse;
using log4net;
namespace OpenSim.Region.Environment.Modules.World.Archiver
@@ -57,7 +56,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
///
/// Used to cache lookups for valid uuids.
///
- private IDictionary m_validUserUuids = new Dictionary();
+ private IDictionary m_validUserUuids = new Dictionary();
public ArchiveReadRequest(Scene scene, string loadPath)
{
@@ -137,8 +136,8 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
// Try to retain the original creator/owner/lastowner if their uuid is present on this grid
// otherwise, use the master avatar uuid instead
- LLUUID masterAvatarId = m_scene.RegionInfo.MasterAvatarAssignedUUID;
- if (m_scene.RegionInfo.EstateSettings.EstateOwner != LLUUID.Zero)
+ UUID masterAvatarId = m_scene.RegionInfo.MasterAvatarAssignedUUID;
+ if (m_scene.RegionInfo.EstateSettings.EstateOwner != UUID.Zero)
masterAvatarId = m_scene.RegionInfo.EstateSettings.EstateOwner;
foreach (SceneObjectPart part in sceneObject.Children.Values)
{
@@ -184,7 +183,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
///
///
///
- private bool resolveUserUuid(LLUUID uuid)
+ private bool resolveUserUuid(UUID uuid)
{
if (!m_validUserUuids.ContainsKey(uuid))
{
@@ -209,7 +208,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
/// true if asset was successfully loaded, false otherwise
private bool LoadAsset(string assetPath, byte[] data)
{
- // Right now we're nastily obtaining the lluuid from the filename
+ // Right now we're nastily obtaining the UUID from the filename
string filename = assetPath.Remove(0, ArchiveConstants.ASSETS_PATH.Length);
int i = filename.LastIndexOf(ArchiveConstants.ASSET_EXTENSION_SEPARATOR);
@@ -231,7 +230,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
//m_log.DebugFormat("[ARCHIVER]: Importing asset {0}, type {1}", uuid, assetType);
- AssetBase asset = new AssetBase(new LLUUID(uuid), String.Empty);
+ AssetBase asset = new AssetBase(new UUID(uuid), String.Empty);
asset.Type = assetType;
asset.Data = data;
--
cgit v1.1