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.
---
.../Environment/Modules/World/Archiver/AssetsRequest.cs | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
(limited to 'OpenSim/Region/Environment/Modules/World/Archiver/AssetsRequest.cs')
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/AssetsRequest.cs b/OpenSim/Region/Environment/Modules/World/Archiver/AssetsRequest.cs
index 2164f7e..41fbc16 100644
--- a/OpenSim/Region/Environment/Modules/World/Archiver/AssetsRequest.cs
+++ b/OpenSim/Region/Environment/Modules/World/Archiver/AssetsRequest.cs
@@ -32,7 +32,7 @@ using OpenSim.Region.Environment.Scenes;
using System.Collections.Generic;
//using System.Reflection;
using System.Threading;
-using libsecondlife;
+using OpenMetaverse;
//using log4net;
namespace OpenSim.Region.Environment.Modules.World.Archiver
@@ -47,7 +47,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
///
/// uuids to request
///
- protected ICollection m_uuids;
+ protected ICollection m_uuids;
///
/// Callback used when all the assets requested have been received.
@@ -57,12 +57,12 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
///
/// Assets retrieved in this request
///
- protected Dictionary m_assets = new Dictionary();
+ protected Dictionary m_assets = new Dictionary();
///
/// Maintain a list of assets that could not be found. This will be passed back to the requester.
///
- protected List m_notFoundAssetUuids = new List();
+ protected List m_notFoundAssetUuids = new List();
///
/// Record the number of asset replies required so we know when we've finished
@@ -74,7 +74,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
///
protected AssetCache m_assetCache;
- protected internal AssetsRequest(ICollection uuids, AssetCache assetCache, AssetsRequestCallback assetsRequestCallback)
+ protected internal AssetsRequest(ICollection uuids, AssetCache assetCache, AssetsRequestCallback assetsRequestCallback)
{
m_uuids = uuids;
m_assetsRequestCallback = assetsRequestCallback;
@@ -88,7 +88,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
if (m_repliesRequired == 0)
m_assetsRequestCallback(m_assets, m_notFoundAssetUuids);
- foreach (LLUUID uuid in m_uuids)
+ foreach (UUID uuid in m_uuids)
{
m_assetCache.GetAsset(uuid, AssetRequestCallback, true);
}
@@ -99,7 +99,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
///
///
///
- public void AssetRequestCallback(LLUUID assetID, AssetBase asset)
+ public void AssetRequestCallback(UUID assetID, AssetBase asset)
{
if (asset != null)
m_assets[assetID] = asset;
--
cgit v1.1