From a1c5de0f94ecdf614dba3aaae7aaa60ceefa09c9 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Fri, 7 Jan 2011 12:32:47 -0800
Subject: Try to fix a IAR problem reported by nebadon, where save iar seems
 stuck forever.

---
 OpenSim/Region/Framework/Scenes/UuidGatherer.cs | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'OpenSim/Region')

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
         /// <param name="assetUuids">The assets gathered</param>
         public void GatherAssetUuids(UUID assetUuid, AssetType assetType, IDictionary<UUID, AssetType> assetUuids)
         {
+            // avoid infinite loops
+            if (assetUuids.ContainsKey(assetUuid))
+                return;
+
             try
             {               
                 assetUuids[assetUuid] = assetType;
-- 
cgit v1.1