Merge

2 files changed, 6 insertions, 13 deletions

diff --git a/indra/newview/llnamelistctrl.cpp b/indra/newview/llnamelistctrl.cpp
index 883d4cdf4b..7a538e372b 100644
--- a/indra/newview/llnamelistctrl.cpp
+++ b/indra/newview/llnamelistctrl.cpp
@@ -142,11 +142,12 @@ void LLNameListCtrl::showInspector(const LLUUID& avatar_id, bool is_group)
 
 void	LLNameListCtrl::mouseOverHighlightNthItem( S32 target_index )
 {
-	if (getHighlightedItemInx()!= target_index)
+	S32 cur_index = getHighlightedItemInx();
+	if (cur_index != target_index)
 	{
-		if(getHighlightedItemInx()!=-1)
+		if(0 <= cur_index && cur_index < (S32)getItemList().size())
 		{
-			LLScrollListItem* item = getItemList()[getHighlightedItemInx()];
+			LLScrollListItem* item = getItemList()[cur_index];
 			LLScrollListText* cell = dynamic_cast<LLScrollListText*>(item->getColumn(mNameColumnIndex));
 			if(cell)
 				cell->setTextWidth(cell->getTextWidth() + info_icon_size);
diff --git a/indra/newview/llpopupview.cpp b/indra/newview/llpopupview.cpp
index d8ad59c90c..b010f4d72f 100644
--- a/indra/newview/llpopupview.cpp
+++ b/indra/newview/llpopupview.cpp
@@ -207,11 +207,7 @@ void LLPopupView::addPopup(LLView* popup)
 {
 	if (popup)
 	{
-		popup_list_t::iterator iter = std::find(mPopups.begin(), mPopups.end(), popup->getHandle());
-		if(iter != mPopups.end())
-		{
-			mPopups.erase(iter);
-		}
+		mPopups.remove(popup->getHandle());
 		mPopups.push_front(popup->getHandle());
 	}
 }
@@ -220,11 +216,7 @@ void LLPopupView::removePopup(LLView* popup)
 {
 	if (popup)
 	{
-		popup_list_t::iterator iter = std::find(mPopups.begin(), mPopups.end(), popup->getHandle());
-		if(iter != mPopups.end())
-		{
-			mPopups.erase(iter);
-		}
+		mPopups.remove(popup->getHandle());
 		popup->onTopLost();
 	}
 }