1 files changed, 5 insertions, 41 deletions

diff --git a/indra/newview/llfolderview.cpp b/indra/newview/llfolderview.cpp
index 5aa504eb35..87c5a830e9 100644
--- a/indra/newview/llfolderview.cpp
+++ b/indra/newview/llfolderview.cpp
@@ -1195,7 +1195,7 @@ void LLFolderView::propertiesSelectedItems( void )
 
 void LLFolderView::changeType(LLInventoryModel *model, LLFolderType::EType new_folder_type)
 {
-	LLFolderBridge *folder_bridge = LLFolderBridge::sSelf.get();
+	LLFolderBridge *folder_bridge = LLFolderBridge::sSelf;
 
 	if (!folder_bridge) return;
 	LLViewerInventoryCategory *cat = folder_bridge->getCategory();
@@ -1874,18 +1874,13 @@ BOOL LLFolderView::handleRightMouseDown( S32 x, S32 y, MASK mask )
 		}
 		
 		// Successively filter out invalid options
-
+		selected_items_t::iterator item_itor;
 		U32 flags = FIRST_SELECTED_ITEM;
-		for (selected_items_t::iterator item_itor = mSelectedItems.begin(); 
-			 item_itor != mSelectedItems.end(); 
-			 ++item_itor)
+		for (item_itor = mSelectedItems.begin(); item_itor != mSelectedItems.end(); ++item_itor)
 		{
-			LLFolderViewItem* selected_item = (*item_itor);
-			selected_item->buildContextMenu(*menu, flags);
+			(*item_itor)->buildContextMenu(*menu, flags);
 			flags = 0x0;
 		}
-	   
-		addNoOptions(menu);
 
 		menu->updateParent(LLMenuGL::sMenuContainer);
 		LLMenuGL::showPopup(this, menu, x, y);
@@ -1894,7 +1889,7 @@ BOOL LLFolderView::handleRightMouseDown( S32 x, S32 y, MASK mask )
 	}
 	else
 	{
-		if (menu && menu->getVisible())
+		if(menu && menu->getVisible())
 		{
 			menu->setVisible(FALSE);
 		}
@@ -1903,37 +1898,6 @@ BOOL LLFolderView::handleRightMouseDown( S32 x, S32 y, MASK mask )
 	return handled;
 }
 
-// Add "--no options--" if the menu is completely blank.
-BOOL LLFolderView::addNoOptions(LLMenuGL* menu) const
-{
-	const std::string nooptions_str = "--no options--";
-	LLView *nooptions_item = NULL;
-	
-	const LLView::child_list_t *list = menu->getChildList();
-	for (LLView::child_list_t::const_iterator itor = list->begin(); 
-		 itor != list->end(); 
-		 ++itor)
-	{
-		LLView *menu_item = (*itor);
-		if (menu_item->getVisible())
-		{
-			return FALSE;
-		}
-		std::string name = menu_item->getName();
-		if (menu_item->getName() == nooptions_str)
-		{
-			nooptions_item = menu_item;
-		}
-	}
-	if (nooptions_item)
-	{
-		nooptions_item->setVisible(TRUE);
-		nooptions_item->setEnabled(FALSE);
-		return TRUE;
-	}
-	return FALSE;
-}
-
 BOOL LLFolderView::handleHover( S32 x, S32 y, MASK mask )
 {
 	return LLView::handleHover( x, y, mask );