aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules
diff options
context:
space:
mode:
authorDiva Canto2013-07-23 15:04:24 -0700
committerDiva Canto2013-07-23 15:05:32 -0700
commit516062ae1fb7417bbd1e206cb412da41094addfb (patch)
tree89c87678278534cc00bf03499ce83c12999cd21f /OpenSim/Region/CoreModules
parentRestoring landing on prims, which had been affected by the edit beams commit. (diff)
downloadopensim-SC_OLD-516062ae1fb7417bbd1e206cb412da41094addfb.zip
opensim-SC_OLD-516062ae1fb7417bbd1e206cb412da41094addfb.tar.gz
opensim-SC_OLD-516062ae1fb7417bbd1e206cb412da41094addfb.tar.bz2
opensim-SC_OLD-516062ae1fb7417bbd1e206cb412da41094addfb.tar.xz
Don't touch the Current Outfit folder also on coming back home
Diffstat (limited to 'OpenSim/Region/CoreModules')
-rw-r--r--OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs10
1 files changed, 9 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs
index 94ea077..8f9800f 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs
@@ -351,7 +351,15 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
351 InventoryFolderBase root = m_Scene.InventoryService.GetRootFolder(client.AgentId); 351 InventoryFolderBase root = m_Scene.InventoryService.GetRootFolder(client.AgentId);
352 InventoryCollection content = m_Scene.InventoryService.GetFolderContent(client.AgentId, root.ID); 352 InventoryCollection content = m_Scene.InventoryService.GetFolderContent(client.AgentId, root.ID);
353 353
354 inv.SendBulkUpdateInventory(content.Folders.ToArray(), content.Items.ToArray()); 354 List<InventoryFolderBase> keep = new List<InventoryFolderBase>();
355
356 foreach (InventoryFolderBase f in content.Folders)
357 {
358 if (f.Name != "My Suitcase" && f.Name != "Current Outfit")
359 keep.Add(f);
360 }
361
362 inv.SendBulkUpdateInventory(keep.ToArray(), content.Items.ToArray());
355 } 363 }
356 } 364 }
357 } 365 }