aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs4
-rw-r--r--OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/UuidGatherer.cs (renamed from OpenSim/Region/Framework/Scenes/AssetGatherer.cs)8
3 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs
index cf781cf..8d25d0f 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs
@@ -46,7 +46,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
46 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 46 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
47 47
48 protected TarArchiveWriter archive = new TarArchiveWriter(); 48 protected TarArchiveWriter archive = new TarArchiveWriter();
49 protected AssetGatherer m_assetGatherer; 49 protected UuidGatherer m_assetGatherer;
50 protected Dictionary<UUID, int> assetUuids = new Dictionary<UUID, int>(); 50 protected Dictionary<UUID, int> assetUuids = new Dictionary<UUID, int>();
51 51
52 private InventoryArchiverModule m_module; 52 private InventoryArchiverModule m_module;
@@ -81,7 +81,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
81 m_userInfo = userInfo; 81 m_userInfo = userInfo;
82 m_invPath = invPath; 82 m_invPath = invPath;
83 m_saveStream = saveStream; 83 m_saveStream = saveStream;
84 m_assetGatherer = new AssetGatherer(m_module.CommsManager.AssetCache); 84 m_assetGatherer = new UuidGatherer(m_module.CommsManager.AssetCache);
85 } 85 }
86 86
87 protected void ReceivedAllAssets(IDictionary<UUID, AssetBase> assetsFound, ICollection<UUID> assetsNotFoundUuids) 87 protected void ReceivedAllAssets(IDictionary<UUID, AssetBase> assetsFound, ICollection<UUID> assetsNotFoundUuids)
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs
index 1edd2dc..accf7e4 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs
@@ -96,7 +96,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
96 } 96 }
97 } 97 }
98 98
99 AssetGatherer assetGatherer = new AssetGatherer(m_scene.CommsManager.AssetCache); 99 UuidGatherer assetGatherer = new UuidGatherer(m_scene.CommsManager.AssetCache);
100 100
101 foreach (SceneObjectGroup sceneObject in sceneObjects) 101 foreach (SceneObjectGroup sceneObject in sceneObjects)
102 { 102 {
diff --git a/OpenSim/Region/Framework/Scenes/AssetGatherer.cs b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
index 00a4398..bc8896e 100644
--- a/OpenSim/Region/Framework/Scenes/AssetGatherer.cs
+++ b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
@@ -37,14 +37,14 @@ using OpenSim.Framework;
37namespace OpenSim.Region.Framework.Scenes 37namespace OpenSim.Region.Framework.Scenes
38{ 38{
39 /// <summary> 39 /// <summary>
40 /// Gather assets for a given object. 40 /// Gather uuids for a given entity.
41 /// </summary> 41 /// </summary>
42 /// 42 ///
43 /// This does a deep inspection of the object to retrieve all the assets it uses (whether as textures, as scripts 43 /// This does a deep inspection of the entity to retrieve all the assets it uses (whether as textures, as scripts
44 /// contained in inventory, as scripts contained in objects contained in another object's inventory, etc. Assets 44 /// contained in inventory, as scripts contained in objects contained in another object's inventory, etc. Assets
45 /// are only retrieved when they are necessary to carry out the inspection (i.e. a serialized object needs to be 45 /// are only retrieved when they are necessary to carry out the inspection (i.e. a serialized object needs to be
46 /// retrieved to work out which assets it references). 46 /// retrieved to work out which assets it references).
47 public class AssetGatherer 47 public class UuidGatherer
48 { 48 {
49 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 49 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
50 50
@@ -64,7 +64,7 @@ namespace OpenSim.Region.Framework.Scenes
64 /// </summary> 64 /// </summary>
65 protected bool m_waitingForObjectAsset; 65 protected bool m_waitingForObjectAsset;
66 66
67 public AssetGatherer(IAssetCache assetCache) 67 public UuidGatherer(IAssetCache assetCache)
68 { 68 {
69 m_assetCache = assetCache; 69 m_assetCache = assetCache;
70 } 70 }