aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services
diff options
context:
space:
mode:
authorDiva Canto2009-08-11 10:42:44 -0700
committerDiva Canto2009-08-11 10:42:44 -0700
commit263f32a493c0fff5f80e21ff269bbf8b456d3fa6 (patch)
treec0ceb6954a39b2d9efd156557c2d802276b20e84 /OpenSim/Services
parentSystem folders inventory cache added to OUT inventory modules. This tracks ag... (diff)
downloadopensim-SC_OLD-263f32a493c0fff5f80e21ff269bbf8b456d3fa6.zip
opensim-SC_OLD-263f32a493c0fff5f80e21ff269bbf8b456d3fa6.tar.gz
opensim-SC_OLD-263f32a493c0fff5f80e21ff269bbf8b456d3fa6.tar.bz2
opensim-SC_OLD-263f32a493c0fff5f80e21ff269bbf8b456d3fa6.tar.xz
Improved test for system folders. Removed log messages.
Diffstat (limited to 'OpenSim/Services')
-rw-r--r--OpenSim/Services/InventoryService/InventoryService.cs3
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Services/InventoryService/InventoryService.cs b/OpenSim/Services/InventoryService/InventoryService.cs
index fc54c12..a9ecda4 100644
--- a/OpenSim/Services/InventoryService/InventoryService.cs
+++ b/OpenSim/Services/InventoryService/InventoryService.cs
@@ -284,12 +284,13 @@ namespace OpenSim.Services.InventoryService
284 Dictionary<AssetType, InventoryFolderBase> folders = new Dictionary<AssetType, InventoryFolderBase>(); 284 Dictionary<AssetType, InventoryFolderBase> folders = new Dictionary<AssetType, InventoryFolderBase>();
285 foreach (InventoryFolderBase folder in content.Folders) 285 foreach (InventoryFolderBase folder in content.Folders)
286 { 286 {
287 if (folder.Type != (short)AssetType.Folder) 287 if ((folder.Type != (short)AssetType.Folder) && (folder.Type != (short)AssetType.Unknown))
288 folders[(AssetType)folder.Type] = folder; 288 folders[(AssetType)folder.Type] = folder;
289 } 289 }
290 return folders; 290 return folders;
291 } 291 }
292 } 292 }
293 m_log.WarnFormat("[INVENTORY SERVICE]: System folders for {0} not found", userID);
293 return new Dictionary<AssetType, InventoryFolderBase>(); 294 return new Dictionary<AssetType, InventoryFolderBase>();
294 } 295 }
295 296