diff options
author | Justin Clarke Casey | 2009-02-18 21:02:43 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2009-02-18 21:02:43 +0000 |
commit | 89f2589f6c12e7cd265c25f7f83bd1b3f1e98d7e (patch) | |
tree | dc23461c298a5a1156a6b4141a216f938baae964 /OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs | |
parent | Fixes height on Basic Physics in local teleports. Plus some small refactoring. (diff) | |
download | opensim-SC_OLD-89f2589f6c12e7cd265c25f7f83bd1b3f1e98d7e.zip opensim-SC_OLD-89f2589f6c12e7cd265c25f7f83bd1b3f1e98d7e.tar.gz opensim-SC_OLD-89f2589f6c12e7cd265c25f7f83bd1b3f1e98d7e.tar.bz2 opensim-SC_OLD-89f2589f6c12e7cd265c25f7f83bd1b3f1e98d7e.tar.xz |
* Change AssetGatherer method access so that only methods which are worth calling from the outside are public
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs index 1152a1e..7f228e4 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs | |||
@@ -37,6 +37,7 @@ using OpenSim.Framework; | |||
37 | using OpenSim.Framework.Communications; | 37 | using OpenSim.Framework.Communications; |
38 | using OpenSim.Framework.Communications.Cache; | 38 | using OpenSim.Framework.Communications.Cache; |
39 | using OpenSim.Region.CoreModules.World.Archiver; | 39 | using OpenSim.Region.CoreModules.World.Archiver; |
40 | using OpenSim.Region.Framework.Scenes; | ||
40 | 41 | ||
41 | namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | 42 | namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver |
42 | { | 43 | { |
@@ -45,6 +46,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
45 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 46 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
46 | 47 | ||
47 | protected TarArchiveWriter archive = new TarArchiveWriter(); | 48 | protected TarArchiveWriter archive = new TarArchiveWriter(); |
49 | protected AssetGatherer m_assetGatherer; | ||
48 | protected Dictionary<UUID, int> assetUuids = new Dictionary<UUID, int>(); | 50 | protected Dictionary<UUID, int> assetUuids = new Dictionary<UUID, int>(); |
49 | 51 | ||
50 | private InventoryArchiverModule m_module; | 52 | private InventoryArchiverModule m_module; |
@@ -78,7 +80,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
78 | m_module = module; | 80 | m_module = module; |
79 | m_userInfo = userInfo; | 81 | m_userInfo = userInfo; |
80 | m_invPath = invPath; | 82 | m_invPath = invPath; |
81 | m_saveStream = saveStream; | 83 | m_saveStream = saveStream; |
84 | m_assetGatherer = new AssetGatherer(m_module.CommsManager.AssetCache); | ||
82 | } | 85 | } |
83 | 86 | ||
84 | protected void ReceivedAllAssets(IDictionary<UUID, AssetBase> assetsFound, ICollection<UUID> assetsNotFoundUuids) | 87 | protected void ReceivedAllAssets(IDictionary<UUID, AssetBase> assetsFound, ICollection<UUID> assetsNotFoundUuids) |