diff options
| author | Diva Canto | 2013-07-05 20:17:10 -0700 |
|---|---|---|
| committer | Diva Canto | 2013-07-05 20:17:10 -0700 |
| commit | c358d5d168f349cbfbb10c1c4f1e992830b11fa4 (patch) | |
| tree | 90cb5b5a085676e325d899fdf6236eb4fe41ba7e /OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC_OLD-c358d5d168f349cbfbb10c1c4f1e992830b11fa4.zip opensim-SC_OLD-c358d5d168f349cbfbb10c1c4f1e992830b11fa4.tar.gz opensim-SC_OLD-c358d5d168f349cbfbb10c1c4f1e992830b11fa4.tar.bz2 opensim-SC_OLD-c358d5d168f349cbfbb10c1c4f1e992830b11fa4.tar.xz | |
Changed a few bits in Inventory/Archiver/InventoryArchiveReadRequest.cs to be less dependent on a Scene.
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs')
| -rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs index 849449b..797097f 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs | |||
| @@ -294,7 +294,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
| 294 | 294 | ||
| 295 | try | 295 | try |
| 296 | { | 296 | { |
| 297 | request = new InventoryArchiveReadRequest(m_aScene, userInfo, invPath, loadStream, merge); | 297 | request = new InventoryArchiveReadRequest(m_aScene.InventoryService, m_aScene.AssetService, m_aScene.UserAccountService, userInfo, invPath, loadStream, merge); |
| 298 | } | 298 | } |
| 299 | catch (EntryPointNotFoundException e) | 299 | catch (EntryPointNotFoundException e) |
| 300 | { | 300 | { |
| @@ -342,7 +342,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
| 342 | 342 | ||
| 343 | try | 343 | try |
| 344 | { | 344 | { |
| 345 | request = new InventoryArchiveReadRequest(m_aScene, userInfo, invPath, loadPath, merge); | 345 | request = new InventoryArchiveReadRequest(m_aScene.InventoryService, m_aScene.AssetService, m_aScene.UserAccountService, userInfo, invPath, loadPath, merge); |
| 346 | } | 346 | } |
| 347 | catch (EntryPointNotFoundException e) | 347 | catch (EntryPointNotFoundException e) |
| 348 | { | 348 | { |