diff options
author | Justin Clark-Casey (justincc) | 2014-12-04 23:55:59 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2014-12-04 23:55:59 +0000 |
commit | 9208fb5d543e5dd226d8d900c78a5056fea4f022 (patch) | |
tree | 6571fe8711c1b676c29f26eebd84c45c06b7b60a /OpenSim/Region/CoreModules/Framework/EntityTransfer | |
parent | Allow scripts in attachments on an owned NPC to call NPC functions on that NPC (diff) | |
download | opensim-SC_OLD-9208fb5d543e5dd226d8d900c78a5056fea4f022.zip opensim-SC_OLD-9208fb5d543e5dd226d8d900c78a5056fea4f022.tar.gz opensim-SC_OLD-9208fb5d543e5dd226d8d900c78a5056fea4f022.tar.bz2 opensim-SC_OLD-9208fb5d543e5dd226d8d900c78a5056fea4f022.tar.xz |
refactor: Make IteratingUUIDGatherer take a dictionary in its constructor like UUIDGatherer, so we can deal with future cases where the dictionary may already be pre-populated.
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework/EntityTransfer')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs index 97267c1..fc932b0 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs | |||
@@ -604,7 +604,9 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
604 | // "[HG ENTITY TRANSFER MODULE]: Incoming attachment {0} for HG user {1} with asset service {2}", | 604 | // "[HG ENTITY TRANSFER MODULE]: Incoming attachment {0} for HG user {1} with asset service {2}", |
605 | // so.Name, so.AttachedAvatar, url); | 605 | // so.Name, so.AttachedAvatar, url); |
606 | 606 | ||
607 | IteratingHGUuidGatherer uuidGatherer = new IteratingHGUuidGatherer(Scene.AssetService, url); | 607 | IDictionary<UUID, sbyte> ids = new Dictionary<UUID, sbyte>(); |
608 | IteratingHGUuidGatherer uuidGatherer | ||
609 | = new IteratingHGUuidGatherer(Scene.AssetService, url, ids); | ||
608 | uuidGatherer.RecordAssetUuids(so); | 610 | uuidGatherer.RecordAssetUuids(so); |
609 | 611 | ||
610 | while (!uuidGatherer.Complete) | 612 | while (!uuidGatherer.Complete) |
@@ -632,8 +634,6 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
632 | } | 634 | } |
633 | } | 635 | } |
634 | 636 | ||
635 | IDictionary<UUID, sbyte> ids = uuidGatherer.GetGatheredUuids(); | ||
636 | |||
637 | // m_log.DebugFormat( | 637 | // m_log.DebugFormat( |
638 | // "[HG ENTITY TRANSFER]: Fetching {0} assets for attachment {1} for HG user {2} with asset service {3}", | 638 | // "[HG ENTITY TRANSFER]: Fetching {0} assets for attachment {1} for HG user {2} with asset service {3}", |
639 | // ids.Count, so.Name, so.OwnerID, url); | 639 | // ids.Count, so.Name, so.OwnerID, url); |