diff options
Heart surgery on asset service code bits. Affects OpenSim.ini configuration -- please see the example. Affects region servers only.
This may break a lot of things, but it needs to go in. It was tested in standalone and the UCI grid, but it needs a lot more testing.
Known problems:
* HG asset transfers are borked for now
* missing texture is missing
* 3 unit tests commented out for now
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs index fec2425..b3014ef 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs | |||
@@ -97,7 +97,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
97 | m_userInfo = userInfo; | 97 | m_userInfo = userInfo; |
98 | m_invPath = invPath; | 98 | m_invPath = invPath; |
99 | m_saveStream = saveStream; | 99 | m_saveStream = saveStream; |
100 | m_assetGatherer = new UuidGatherer(m_module.CommsManager.AssetCache); | 100 | m_assetGatherer = new UuidGatherer(m_module.AssetService); |
101 | } | 101 | } |
102 | 102 | ||
103 | protected void ReceivedAllAssets(ICollection<UUID> assetsFoundUuids, ICollection<UUID> assetsNotFoundUuids) | 103 | protected void ReceivedAllAssets(ICollection<UUID> assetsFoundUuids, ICollection<UUID> assetsNotFoundUuids) |
@@ -297,7 +297,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
297 | SaveUsers(); | 297 | SaveUsers(); |
298 | new AssetsRequest( | 298 | new AssetsRequest( |
299 | new AssetsArchiver(m_archiveWriter), m_assetUuids.Keys, | 299 | new AssetsArchiver(m_archiveWriter), m_assetUuids.Keys, |
300 | m_module.CommsManager.AssetCache, ReceivedAllAssets).Execute(); | 300 | m_module.AssetService, ReceivedAllAssets).Execute(); |
301 | } | 301 | } |
302 | 302 | ||
303 | /// <summary> | 303 | /// <summary> |