aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
diff options
context:
space:
mode:
authorDiva Canto2014-09-28 16:10:32 -0700
committerDiva Canto2014-09-28 16:10:32 -0700
commit763c22b28e5ea5218dd36e30f6bc470b65831866 (patch)
treea6a23a63c41e39273759a3ac68d6f7c174633bbe /OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
parentMove expired objects cleaning trigger to the maintenance thread of a region r... (diff)
downloadopensim-SC_OLD-763c22b28e5ea5218dd36e30f6bc470b65831866.zip
opensim-SC_OLD-763c22b28e5ea5218dd36e30f6bc470b65831866.tar.gz
opensim-SC_OLD-763c22b28e5ea5218dd36e30f6bc470b65831866.tar.bz2
opensim-SC_OLD-763c22b28e5ea5218dd36e30f6bc470b65831866.tar.xz
Improve on the last commit to InventoryArchiver: put back the original constructor (3rd party modules use it), change order of new parameters to make it more consistent.
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs')
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs4
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 5b5987d..420520e 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
@@ -310,7 +310,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
310 310
311 try 311 try
312 { 312 {
313 request = new InventoryArchiveReadRequest(id, m_aScene.InventoryService, this, m_aScene.AssetService, m_aScene.UserAccountService, userInfo, invPath, loadStream, merge); 313 request = new InventoryArchiveReadRequest(id, this, m_aScene.InventoryService, m_aScene.AssetService, m_aScene.UserAccountService, userInfo, invPath, loadStream, merge);
314 } 314 }
315 catch (EntryPointNotFoundException e) 315 catch (EntryPointNotFoundException e)
316 { 316 {
@@ -358,7 +358,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
358 358
359 try 359 try
360 { 360 {
361 request = new InventoryArchiveReadRequest(id, m_aScene.InventoryService, this, m_aScene.AssetService, m_aScene.UserAccountService, userInfo, invPath, loadPath, merge); 361 request = new InventoryArchiveReadRequest(id, this, m_aScene.InventoryService, m_aScene.AssetService, m_aScene.UserAccountService, userInfo, invPath, loadPath, merge);
362 } 362 }
363 catch (EntryPointNotFoundException e) 363 catch (EntryPointNotFoundException e)
364 { 364 {