diff options
author | Diva Canto | 2011-01-07 12:32:47 -0800 |
---|---|---|
committer | Diva Canto | 2011-01-07 12:32:47 -0800 |
commit | a1c5de0f94ecdf614dba3aaae7aaa60ceefa09c9 (patch) | |
tree | cebfb4ae8b18f7ccb3294edd942f0c2477465aed /OpenSim | |
parent | Minor additional debug message. (diff) | |
download | opensim-SC_OLD-a1c5de0f94ecdf614dba3aaae7aaa60ceefa09c9.zip opensim-SC_OLD-a1c5de0f94ecdf614dba3aaae7aaa60ceefa09c9.tar.gz opensim-SC_OLD-a1c5de0f94ecdf614dba3aaae7aaa60ceefa09c9.tar.bz2 opensim-SC_OLD-a1c5de0f94ecdf614dba3aaae7aaa60ceefa09c9.tar.xz |
Try to fix a IAR problem reported by nebadon, where save iar seems stuck forever.
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/UuidGatherer.cs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs index 3978a7d..83906d7 100644 --- a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs +++ b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs | |||
@@ -86,6 +86,10 @@ namespace OpenSim.Region.Framework.Scenes | |||
86 | /// <param name="assetUuids">The assets gathered</param> | 86 | /// <param name="assetUuids">The assets gathered</param> |
87 | public void GatherAssetUuids(UUID assetUuid, AssetType assetType, IDictionary<UUID, AssetType> assetUuids) | 87 | public void GatherAssetUuids(UUID assetUuid, AssetType assetType, IDictionary<UUID, AssetType> assetUuids) |
88 | { | 88 | { |
89 | // avoid infinite loops | ||
90 | if (assetUuids.ContainsKey(assetUuid)) | ||
91 | return; | ||
92 | |||
89 | try | 93 | try |
90 | { | 94 | { |
91 | assetUuids[assetUuid] = assetType; | 95 | assetUuids[assetUuid] = assetType; |