diff options
author | Teravus Ovares | 2008-09-06 07:52:41 +0000 |
---|---|---|
committer | Teravus Ovares | 2008-09-06 07:52:41 +0000 |
commit | 7d89e122930be39e84a6d174548fa2d12ac0484a (patch) | |
tree | e5aa5752f988a9aba2a969f49e5e208985eda80c /OpenSim/Region/Environment/Modules/World/Archiver/AssetsRequest.cs | |
parent | * minor: speculatively try a change to bamboo.build to see if this generates ... (diff) | |
download | opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.zip opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.gz opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.bz2 opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.xz |
* 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.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Modules/World/Archiver/AssetsRequest.cs | 14 |
1 files changed, 7 insertions, 7 deletions
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; | |||
32 | using System.Collections.Generic; | 32 | using System.Collections.Generic; |
33 | //using System.Reflection; | 33 | //using System.Reflection; |
34 | using System.Threading; | 34 | using System.Threading; |
35 | using libsecondlife; | 35 | using OpenMetaverse; |
36 | //using log4net; | 36 | //using log4net; |
37 | 37 | ||
38 | namespace OpenSim.Region.Environment.Modules.World.Archiver | 38 | namespace OpenSim.Region.Environment.Modules.World.Archiver |
@@ -47,7 +47,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver | |||
47 | /// <summary> | 47 | /// <summary> |
48 | /// uuids to request | 48 | /// uuids to request |
49 | /// </summary> | 49 | /// </summary> |
50 | protected ICollection<LLUUID> m_uuids; | 50 | protected ICollection<UUID> m_uuids; |
51 | 51 | ||
52 | /// <summary> | 52 | /// <summary> |
53 | /// Callback used when all the assets requested have been received. | 53 | /// Callback used when all the assets requested have been received. |
@@ -57,12 +57,12 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver | |||
57 | /// <summary> | 57 | /// <summary> |
58 | /// Assets retrieved in this request | 58 | /// Assets retrieved in this request |
59 | /// </summary> | 59 | /// </summary> |
60 | protected Dictionary<LLUUID, AssetBase> m_assets = new Dictionary<LLUUID, AssetBase>(); | 60 | protected Dictionary<UUID, AssetBase> m_assets = new Dictionary<UUID, AssetBase>(); |
61 | 61 | ||
62 | /// <summary> | 62 | /// <summary> |
63 | /// Maintain a list of assets that could not be found. This will be passed back to the requester. | 63 | /// Maintain a list of assets that could not be found. This will be passed back to the requester. |
64 | /// </summary> | 64 | /// </summary> |
65 | protected List<LLUUID> m_notFoundAssetUuids = new List<LLUUID>(); | 65 | protected List<UUID> m_notFoundAssetUuids = new List<UUID>(); |
66 | 66 | ||
67 | /// <summary> | 67 | /// <summary> |
68 | /// Record the number of asset replies required so we know when we've finished | 68 | /// 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 | |||
74 | /// </summary> | 74 | /// </summary> |
75 | protected AssetCache m_assetCache; | 75 | protected AssetCache m_assetCache; |
76 | 76 | ||
77 | protected internal AssetsRequest(ICollection<LLUUID> uuids, AssetCache assetCache, AssetsRequestCallback assetsRequestCallback) | 77 | protected internal AssetsRequest(ICollection<UUID> uuids, AssetCache assetCache, AssetsRequestCallback assetsRequestCallback) |
78 | { | 78 | { |
79 | m_uuids = uuids; | 79 | m_uuids = uuids; |
80 | m_assetsRequestCallback = assetsRequestCallback; | 80 | m_assetsRequestCallback = assetsRequestCallback; |
@@ -88,7 +88,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver | |||
88 | if (m_repliesRequired == 0) | 88 | if (m_repliesRequired == 0) |
89 | m_assetsRequestCallback(m_assets, m_notFoundAssetUuids); | 89 | m_assetsRequestCallback(m_assets, m_notFoundAssetUuids); |
90 | 90 | ||
91 | foreach (LLUUID uuid in m_uuids) | 91 | foreach (UUID uuid in m_uuids) |
92 | { | 92 | { |
93 | m_assetCache.GetAsset(uuid, AssetRequestCallback, true); | 93 | m_assetCache.GetAsset(uuid, AssetRequestCallback, true); |
94 | } | 94 | } |
@@ -99,7 +99,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver | |||
99 | /// </summary> | 99 | /// </summary> |
100 | /// <param name="assetID"></param> | 100 | /// <param name="assetID"></param> |
101 | /// <param name="asset"></param> | 101 | /// <param name="asset"></param> |
102 | public void AssetRequestCallback(LLUUID assetID, AssetBase asset) | 102 | public void AssetRequestCallback(UUID assetID, AssetBase asset) |
103 | { | 103 | { |
104 | if (asset != null) | 104 | if (asset != null) |
105 | m_assets[assetID] = asset; | 105 | m_assets[assetID] = asset; |