From 12042cdc2b53e581ace6a017d9b17bd763a544b2 Mon Sep 17 00:00:00 2001
From: Dr Scofield
Date: Mon, 20 Oct 2008 18:07:06 +0000
Subject: From: Alan Webb <alan_webb@us.ibm.com>

cleanups and assorted fixes to REST inventory, asset, and appearance
services.



---
 OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs')

diff --git a/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs b/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs
index a33fa67..437e5e4 100644
--- a/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs
+++ b/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs
@@ -178,8 +178,14 @@ namespace OpenSim.Framework.Communications.Cache
             if (libraryFolders.ContainsKey(item.Folder))
             {
                 InventoryFolderImpl parentFolder = libraryFolders[item.Folder];
-
-                parentFolder.Items.Add(item.ID, item);
+                try
+                {
+                    parentFolder.Items.Add(item.ID, item);
+                }
+                catch (Exception)
+                {
+                    m_log.WarnFormat("[LIBRARY INVENTORY] Item {1} [{0}] not added, duplicate item", item.ID, item.Name);
+                }
             }
             else
             {
-- 
cgit v1.1