aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2015-01-08 20:21:40 +0000
committerJustin Clark-Casey (justincc)2015-01-08 20:21:40 +0000
commit08606ae409b400b6f9b83006ed04826eede8a9c7 (patch)
treeb11e1ebfa99dfda28aa3df22041c6e3d167491ce /OpenSim/Region/OptionalModules
parentCommented out clear_registry_ because (1) it isn't clearing up anything anymo... (diff)
downloadopensim-SC-08606ae409b400b6f9b83006ed04826eede8a9c7.zip
opensim-SC-08606ae409b400b6f9b83006ed04826eede8a9c7.tar.gz
opensim-SC-08606ae409b400b6f9b83006ed04826eede8a9c7.tar.bz2
opensim-SC-08606ae409b400b6f9b83006ed04826eede8a9c7.tar.xz
Make the IteratingUuidGatherer the only UuidGatherer.
This UUID gatherer provides a superset of the previous gatherer's functionality as it also allows the caller to control gathering iterations for load purposes.
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/OptionalModules/Avatar/Appearance/AppearanceInfoModule.cs10
1 files changed, 6 insertions, 4 deletions
diff --git a/OpenSim/Region/OptionalModules/Avatar/Appearance/AppearanceInfoModule.cs b/OpenSim/Region/OptionalModules/Avatar/Appearance/AppearanceInfoModule.cs
index f67f613..2f9bb1e 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Appearance/AppearanceInfoModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Appearance/AppearanceInfoModule.cs
@@ -426,10 +426,10 @@ namespace OpenSim.Region.OptionalModules.Avatar.Appearance
426 cdl.AddRow("Assets", ""); 426 cdl.AddRow("Assets", "");
427 sb.Append(cdl.ToString()); 427 sb.Append(cdl.ToString());
428 428
429 Dictionary<UUID, sbyte> assetUuids = new Dictionary<UUID, sbyte>(); 429 uuidGatherer.AddForInspection(wi.AssetID);
430 uuidGatherer.GatherAssetUuids(wi.AssetID, assetUuids); 430 uuidGatherer.GatherAll();
431 string[] assetStrings 431 string[] assetStrings
432 = Array.ConvertAll<UUID, string>(assetUuids.Keys.ToArray(), u => u.ToString()); 432 = Array.ConvertAll<UUID, string>(uuidGatherer.GatheredUuids.Keys.ToArray(), u => u.ToString());
433 433
434 bool[] existChecks = scene.AssetService.AssetsExist(assetStrings); 434 bool[] existChecks = scene.AssetService.AssetsExist(assetStrings);
435 435
@@ -440,7 +440,9 @@ namespace OpenSim.Region.OptionalModules.Avatar.Appearance
440 cdt.AddColumn("Found", 5); 440 cdt.AddColumn("Found", 5);
441 441
442 for (int k = 0; k < existChecks.Length; k++) 442 for (int k = 0; k < existChecks.Length; k++)
443 cdt.AddRow((AssetType)assetUuids[new UUID(assetStrings[k])], assetStrings[k], existChecks[k] ? "yes" : "no"); 443 cdt.AddRow(
444 (AssetType)uuidGatherer.GatheredUuids[new UUID(assetStrings[k])],
445 assetStrings[k], existChecks[k] ? "yes" : "no");
444 446
445 sb.Append(cdt.ToString()); 447 sb.Append(cdt.ToString());
446 sb.Append("\n"); 448 sb.Append("\n");