diff options
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs | 24 |
1 files changed, 7 insertions, 17 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs index 55d7997..2c36270 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs | |||
@@ -69,19 +69,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
69 | /// </value> | 69 | /// </value> |
70 | private Dictionary<UUID, Scene> m_scenes = new Dictionary<UUID, Scene>(); | 70 | private Dictionary<UUID, Scene> m_scenes = new Dictionary<UUID, Scene>(); |
71 | private Scene m_aScene; | 71 | private Scene m_aScene; |
72 | |||
73 | /// <value> | ||
74 | /// The comms manager we will use for all comms requests | ||
75 | /// </value> | ||
76 | protected internal CommunicationsManager CommsManager; | ||
77 | protected internal IAssetService AssetService; | ||
78 | 72 | ||
79 | public void Initialise(Scene scene, IConfigSource source) | 73 | public void Initialise(Scene scene, IConfigSource source) |
80 | { | 74 | { |
81 | if (m_scenes.Count == 0) | 75 | if (m_scenes.Count == 0) |
82 | { | 76 | { |
83 | scene.RegisterModuleInterface<IInventoryArchiverModule>(this); | 77 | scene.RegisterModuleInterface<IInventoryArchiverModule>(this); |
84 | CommsManager = scene.CommsManager; | ||
85 | OnInventoryArchiveSaved += SaveInvConsoleCommandCompleted; | 78 | OnInventoryArchiveSaved += SaveInvConsoleCommandCompleted; |
86 | 79 | ||
87 | scene.AddCommand( | 80 | scene.AddCommand( |
@@ -99,11 +92,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
99 | 92 | ||
100 | m_scenes[scene.RegionInfo.RegionID] = scene; | 93 | m_scenes[scene.RegionInfo.RegionID] = scene; |
101 | } | 94 | } |
102 | 95 | ||
103 | public void PostInitialise() | 96 | public void PostInitialise() {} |
104 | { | ||
105 | AssetService = m_aScene.AssetService; | ||
106 | } | ||
107 | 97 | ||
108 | public void Close() {} | 98 | public void Close() {} |
109 | 99 | ||
@@ -126,7 +116,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
126 | CachedUserInfo userInfo = GetUserInfo(firstName, lastName); | 116 | CachedUserInfo userInfo = GetUserInfo(firstName, lastName); |
127 | 117 | ||
128 | if (userInfo != null) | 118 | if (userInfo != null) |
129 | new InventoryArchiveWriteRequest(id, this, userInfo, invPath, saveStream).Execute(); | 119 | new InventoryArchiveWriteRequest(id, this, m_aScene, userInfo, invPath, saveStream).Execute(); |
130 | } | 120 | } |
131 | } | 121 | } |
132 | 122 | ||
@@ -137,7 +127,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
137 | CachedUserInfo userInfo = GetUserInfo(firstName, lastName); | 127 | CachedUserInfo userInfo = GetUserInfo(firstName, lastName); |
138 | 128 | ||
139 | if (userInfo != null) | 129 | if (userInfo != null) |
140 | new InventoryArchiveWriteRequest(id, this, userInfo, invPath, savePath).Execute(); | 130 | new InventoryArchiveWriteRequest(id, this, m_aScene, userInfo, invPath, savePath).Execute(); |
141 | } | 131 | } |
142 | } | 132 | } |
143 | 133 | ||
@@ -150,7 +140,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
150 | if (userInfo != null) | 140 | if (userInfo != null) |
151 | { | 141 | { |
152 | InventoryArchiveReadRequest request = | 142 | InventoryArchiveReadRequest request = |
153 | new InventoryArchiveReadRequest(userInfo, invPath, loadStream, CommsManager, AssetService); | 143 | new InventoryArchiveReadRequest(m_aScene, userInfo, invPath, loadStream); |
154 | UpdateClientWithLoadedNodes(userInfo, request.Execute()); | 144 | UpdateClientWithLoadedNodes(userInfo, request.Execute()); |
155 | } | 145 | } |
156 | } | 146 | } |
@@ -165,7 +155,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
165 | if (userInfo != null) | 155 | if (userInfo != null) |
166 | { | 156 | { |
167 | InventoryArchiveReadRequest request = | 157 | InventoryArchiveReadRequest request = |
168 | new InventoryArchiveReadRequest(userInfo, invPath, loadPath, CommsManager, AssetService); | 158 | new InventoryArchiveReadRequest(m_aScene, userInfo, invPath, loadPath); |
169 | UpdateClientWithLoadedNodes(userInfo, request.Execute()); | 159 | UpdateClientWithLoadedNodes(userInfo, request.Execute()); |
170 | } | 160 | } |
171 | } | 161 | } |
@@ -261,7 +251,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
261 | /// <returns></returns> | 251 | /// <returns></returns> |
262 | protected CachedUserInfo GetUserInfo(string firstName, string lastName) | 252 | protected CachedUserInfo GetUserInfo(string firstName, string lastName) |
263 | { | 253 | { |
264 | CachedUserInfo userInfo = CommsManager.UserProfileCacheService.GetUserDetails(firstName, lastName); | 254 | CachedUserInfo userInfo = m_aScene.CommsManager.UserProfileCacheService.GetUserDetails(firstName, lastName); |
265 | if (null == userInfo) | 255 | if (null == userInfo) |
266 | { | 256 | { |
267 | m_log.ErrorFormat( | 257 | m_log.ErrorFormat( |