diff options
author | Justin Clarke Casey | 2009-02-16 19:15:16 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2009-02-16 19:15:16 +0000 |
commit | 93837807ffb24e5811368063b9231a9d8b018d9d (patch) | |
tree | 5da8dcbc3fd6e6e4c7003e486f0ad26bd7c43d87 /OpenSim/Region/CoreModules/World/Archiver | |
parent | * Iniital inventory archive test code. Doesn't actually do any testing yet (diff) | |
download | opensim-SC_OLD-93837807ffb24e5811368063b9231a9d8b018d9d.zip opensim-SC_OLD-93837807ffb24e5811368063b9231a9d8b018d9d.tar.gz opensim-SC_OLD-93837807ffb24e5811368063b9231a9d8b018d9d.tar.bz2 opensim-SC_OLD-93837807ffb24e5811368063b9231a9d8b018d9d.tar.xz |
* refactor: remove AssetCache field hanging off Scene
* This is always available at Scene.CommsManager.AssetCache
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs index 9497869..66fc43b 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs | |||
@@ -297,7 +297,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
297 | asset.Metadata.Type = assetType; | 297 | asset.Metadata.Type = assetType; |
298 | asset.Data = data; | 298 | asset.Data = data; |
299 | 299 | ||
300 | m_scene.AssetCache.AddAsset(asset); | 300 | m_scene.CommsManager.AssetCache.AddAsset(asset); |
301 | 301 | ||
302 | /** | 302 | /** |
303 | * Create layers on decode for image assets. This is likely to significantly increase the time to load archives so | 303 | * Create layers on decode for image assets. This is likely to significantly increase the time to load archives so |
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs index bd36779..139dff0 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs | |||
@@ -104,7 +104,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
104 | protected AssetBase GetAsset(UUID uuid) | 104 | protected AssetBase GetAsset(UUID uuid) |
105 | { | 105 | { |
106 | m_waitingForObjectAsset = true; | 106 | m_waitingForObjectAsset = true; |
107 | m_scene.AssetCache.GetAsset(uuid, AssetRequestCallback, true); | 107 | m_scene.CommsManager.AssetCache.GetAsset(uuid, AssetRequestCallback, true); |
108 | 108 | ||
109 | // The asset cache callback can either | 109 | // The asset cache callback can either |
110 | // | 110 | // |
@@ -324,7 +324,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
324 | m_scene, | 324 | m_scene, |
325 | m_saveStream); | 325 | m_saveStream); |
326 | 326 | ||
327 | new AssetsRequest(assetUuids.Keys, m_scene.AssetCache, awre.ReceivedAllAssets).Execute(); | 327 | new AssetsRequest(assetUuids.Keys, m_scene.CommsManager.AssetCache, awre.ReceivedAllAssets).Execute(); |
328 | } | 328 | } |
329 | } | 329 | } |
330 | } | 330 | } |