aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Communications
diff options
context:
space:
mode:
authorDr Scofield2008-10-20 18:07:06 +0000
committerDr Scofield2008-10-20 18:07:06 +0000
commit12042cdc2b53e581ace6a017d9b17bd763a544b2 (patch)
tree0d99aa0e5dc5349d420c820c2c78c59f3228957f /OpenSim/Framework/Communications
parentactually enabling SaveOAR XmlRpc ;-) (diff)
downloadopensim-SC_OLD-12042cdc2b53e581ace6a017d9b17bd763a544b2.zip
opensim-SC_OLD-12042cdc2b53e581ace6a017d9b17bd763a544b2.tar.gz
opensim-SC_OLD-12042cdc2b53e581ace6a017d9b17bd763a544b2.tar.bz2
opensim-SC_OLD-12042cdc2b53e581ace6a017d9b17bd763a544b2.tar.xz
From: Alan Webb <alan_webb@us.ibm.com>
cleanups and assorted fixes to REST inventory, asset, and appearance services.
Diffstat (limited to 'OpenSim/Framework/Communications')
-rw-r--r--OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs10
1 files changed, 8 insertions, 2 deletions
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
178 if (libraryFolders.ContainsKey(item.Folder)) 178 if (libraryFolders.ContainsKey(item.Folder))
179 { 179 {
180 InventoryFolderImpl parentFolder = libraryFolders[item.Folder]; 180 InventoryFolderImpl parentFolder = libraryFolders[item.Folder];
181 181 try
182 parentFolder.Items.Add(item.ID, item); 182 {
183 parentFolder.Items.Add(item.ID, item);
184 }
185 catch (Exception)
186 {
187 m_log.WarnFormat("[LIBRARY INVENTORY] Item {1} [{0}] not added, duplicate item", item.ID, item.Name);
188 }
183 } 189 }
184 else 190 else
185 { 191 {