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 'OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs index 0a882eb..f121374 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs | |||
@@ -101,7 +101,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
101 | } | 101 | } |
102 | } | 102 | } |
103 | 103 | ||
104 | UuidGatherer assetGatherer = new UuidGatherer(m_scene.CommsManager.AssetCache); | 104 | UuidGatherer assetGatherer = new UuidGatherer(m_scene.AssetService); |
105 | 105 | ||
106 | foreach (SceneObjectGroup sceneObject in sceneObjects) | 106 | foreach (SceneObjectGroup sceneObject in sceneObjects) |
107 | { | 107 | { |
@@ -141,7 +141,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
141 | 141 | ||
142 | new AssetsRequest( | 142 | new AssetsRequest( |
143 | new AssetsArchiver(archiveWriter), assetUuids.Keys, | 143 | new AssetsArchiver(archiveWriter), assetUuids.Keys, |
144 | m_scene.CommsManager.AssetCache, awre.ReceivedAllAssets).Execute(); | 144 | m_scene.AssetService, awre.ReceivedAllAssets).Execute(); |
145 | } | 145 | } |
146 | } | 146 | } |
147 | } | 147 | } |