From 8de65a8fb360f9ab99a609311dfb56e15a9de76c Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Mon, 1 Jun 2015 20:05:51 -0700 Subject: Mantis #7594: putting things as they were before regarding duplicate removal. Also added test to check that duplicates are being removed. The test passes. I have no idea how duplicates would not be removed, as reported in the mantis. --- .../Capabilities/Handlers/FetchInventory/FetchInvDescHandler.cs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'OpenSim/Capabilities/Handlers/FetchInventory/FetchInvDescHandler.cs') diff --git a/OpenSim/Capabilities/Handlers/FetchInventory/FetchInvDescHandler.cs b/OpenSim/Capabilities/Handlers/FetchInventory/FetchInvDescHandler.cs index 0c83b26..4798dc2 100644 --- a/OpenSim/Capabilities/Handlers/FetchInventory/FetchInvDescHandler.cs +++ b/OpenSim/Capabilities/Handlers/FetchInventory/FetchInvDescHandler.cs @@ -111,10 +111,9 @@ namespace OpenSim.Capabilities.Handlers } // Filter duplicate folder ids that bad viewers may send - var unique = folders.GroupBy(f => f.folder_id).Select(n => n.First()); - folders.Clear(); - foreach (var f in unique) - folders.Add(f); + if (folders.Find(f => f.folder_id == llsdRequest.folder_id) == null) + folders.Add(llsdRequest); + } if (folders.Count > 0) -- cgit v1.1