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/Avatar/Inventory/Archiver/InventoryArchiverModule.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs index c5699c0..efef840 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs | |||
@@ -37,6 +37,7 @@ using OpenSim.Framework.Communications; | |||
37 | using OpenSim.Framework.Communications.Cache; | 37 | using OpenSim.Framework.Communications.Cache; |
38 | using OpenSim.Region.Framework.Interfaces; | 38 | using OpenSim.Region.Framework.Interfaces; |
39 | using OpenSim.Region.Framework.Scenes; | 39 | using OpenSim.Region.Framework.Scenes; |
40 | using OpenSim.Services.Interfaces; | ||
40 | 41 | ||
41 | namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | 42 | namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver |
42 | { | 43 | { |
@@ -62,11 +63,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
62 | /// All scenes that this module knows about | 63 | /// All scenes that this module knows about |
63 | /// </value> | 64 | /// </value> |
64 | private Dictionary<UUID, Scene> m_scenes = new Dictionary<UUID, Scene>(); | 65 | private Dictionary<UUID, Scene> m_scenes = new Dictionary<UUID, Scene>(); |
65 | 66 | private Scene m_aScene; | |
66 | /// <value> | 67 | /// <value> |
67 | /// The comms manager we will use for all comms requests | 68 | /// The comms manager we will use for all comms requests |
68 | /// </value> | 69 | /// </value> |
69 | protected internal CommunicationsManager CommsManager; | 70 | protected internal CommunicationsManager CommsManager; |
71 | protected internal IAssetService AssetService; | ||
70 | 72 | ||
71 | public void Initialise(Scene scene, IConfigSource source) | 73 | public void Initialise(Scene scene, IConfigSource source) |
72 | { | 74 | { |
@@ -84,13 +86,18 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
84 | scene.AddCommand( | 86 | scene.AddCommand( |
85 | this, "save iar", | 87 | this, "save iar", |
86 | "save iar <first> <last> <inventory path> [<archive path>]", | 88 | "save iar <first> <last> <inventory path> [<archive path>]", |
87 | "Save user inventory archive. EXPERIMENTAL, PLEASE DO NOT USE YET", HandleSaveInvConsoleCommand); | 89 | "Save user inventory archive. EXPERIMENTAL, PLEASE DO NOT USE YET", HandleSaveInvConsoleCommand); |
90 | |||
91 | m_aScene = scene; | ||
88 | } | 92 | } |
89 | 93 | ||
90 | m_scenes[scene.RegionInfo.RegionID] = scene; | 94 | m_scenes[scene.RegionInfo.RegionID] = scene; |
91 | } | 95 | } |
92 | 96 | ||
93 | public void PostInitialise() {} | 97 | public void PostInitialise() |
98 | { | ||
99 | AssetService = m_aScene.AssetService; | ||
100 | } | ||
94 | 101 | ||
95 | public void Close() {} | 102 | public void Close() {} |
96 | 103 | ||
@@ -114,7 +121,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
114 | if (userInfo != null) | 121 | if (userInfo != null) |
115 | { | 122 | { |
116 | InventoryArchiveReadRequest request = | 123 | InventoryArchiveReadRequest request = |
117 | new InventoryArchiveReadRequest(userInfo, invPath, loadStream, CommsManager); | 124 | new InventoryArchiveReadRequest(userInfo, invPath, loadStream, CommsManager, AssetService); |
118 | UpdateClientWithLoadedNodes(userInfo, request.Execute()); | 125 | UpdateClientWithLoadedNodes(userInfo, request.Execute()); |
119 | } | 126 | } |
120 | } | 127 | } |
@@ -140,7 +147,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
140 | if (userInfo != null) | 147 | if (userInfo != null) |
141 | { | 148 | { |
142 | InventoryArchiveReadRequest request = | 149 | InventoryArchiveReadRequest request = |
143 | new InventoryArchiveReadRequest(userInfo, invPath, loadPath, CommsManager); | 150 | new InventoryArchiveReadRequest(userInfo, invPath, loadPath, CommsManager, AssetService); |
144 | UpdateClientWithLoadedNodes(userInfo, request.Execute()); | 151 | UpdateClientWithLoadedNodes(userInfo, request.Execute()); |
145 | } | 152 | } |
146 | } | 153 | } |