From 7dada07dbaae3dfb9b1319453e51019bfff2717f Mon Sep 17 00:00:00 2001
From: Josh Bell <josh@lindenlab.com>
Date: Tue, 20 Feb 2007 22:02:36 +0000
Subject: svn merge -r 57620:58007
 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance

---
 indra/newview/llinventorybridge.cpp | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(limited to 'indra/newview/llinventorybridge.cpp')

diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index b1b57fb003..f4280aae9c 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -327,6 +327,14 @@ void hideContextEntries(LLMenuGL& menu,
 	for (itor = list->begin(); itor != list->end(); ++itor)
 	{
 		LLString name = (*itor)->getName();
+
+		// descend into split menus:
+		if ((name == "More") && (WIDGET_TYPE_MENU_ITEM_BRANCH == (*itor)->getWidgetType()))
+		{
+			hideContextEntries(*((LLMenuItemBranchGL *)(*itor))->getBranch(), entries_to_show, disabled_entries);
+		}
+		
+		
 		bool found = false;
 		std::vector<LLString>::const_iterator itor2;
 		for (itor2 = entries_to_show.begin(); itor2 != entries_to_show.end(); ++itor2)
@@ -1758,6 +1766,14 @@ void LLFolderBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
 	LLInventoryModel* model = mInventoryPanel->getModel();
 	if(!model) return;
 	LLUUID trash_id = model->findCategoryUUIDForType(LLAssetType::AT_TRASH);
+	LLUUID lost_and_found_id = model->findCategoryUUIDForType(LLAssetType::AT_LOST_AND_FOUND);
+
+	if (lost_and_found_id == mUUID)
+	  {
+		// This is the lost+found folder.
+		mItems.push_back("Empty Lost And Found");
+	  }
+
 	if(trash_id == mUUID)
 	{
 		// This is the trash.
-- 
cgit v1.2.3