diff --git a/indra/newview/fsradarlistctrl.cpp b/indra/newview/fsradarlistctrl.cpp
index 249a6df5d5..ea980d12a1 100644
--- a/indra/newview/fsradarlistctrl.cpp
+++ b/indra/newview/fsradarlistctrl.cpp
@@ -68,16 +68,30 @@ BOOL LLRadarListCtrl::handleRightMouseDown(S32 x, S32 y, MASK mask)
 	if ( (mContextMenu) && (!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES)) )
 // [/RLVa:KB-FS]
 	{
-		LLScrollListItem* hit_item = hitItem(x, y);
-		if (hit_item)
+		if(getAllSelected().size() > 1)
 		{
-			llinfos << "Right-click select by value: " << hit_item->getValue() << llendl;
-			selectByID(hit_item->getValue());
-			LLUUID av = hit_item->getValue();
+			//llinfos << "Right-click select by value: (multi-select)" << llendl;
 			uuid_vec_t selected_uuids;
-			selected_uuids.push_back(av);
+			for(size_t i=0;i<getAllSelected().size();i++)
+			{
+				llinfos << "Right-click select by value: " << getAllSelected().at(i)->getColumn(getColumn("uuid")->mIndex)->getValue().asUUID() << llendl;
+				selected_uuids.push_back(getAllSelected().at(i)->getColumn(getColumn("uuid")->mIndex)->getValue().asUUID());
+			}
 			mContextMenu->show(this, selected_uuids, x, y);
 		}
+		else
+		{
+			LLScrollListItem* hit_item = hitItem(x, y);
+			if (hit_item)
+			{
+				llinfos << "Right-click select by value: " << hit_item->getValue() << llendl;
+				selectByID(hit_item->getValue());
+				LLUUID av = hit_item->getValue();
+				uuid_vec_t selected_uuids;
+				selected_uuids.push_back(av);
+				mContextMenu->show(this, selected_uuids, x, y);
+			}
+		}
 	}
 	return handled;
 }
diff --git a/indra/newview/llpanelpeople.cpp b/indra/newview/llpanelpeople.cpp
index 8de20f85a3..7976e4426d 100644
--- a/indra/newview/llpanelpeople.cpp
+++ b/indra/newview/llpanelpeople.cpp
@@ -902,13 +902,12 @@ void LLPanelPeople::updateNearbyList()
 	time_t now = time(NULL);
 
 	//STEP 0: Clear model data, saving pieces as needed.
-	LLScrollListItem* lastRadarSelectedItem = mRadarList->getFirstSelected();
-	LLUUID selected_id;
-	S32 lastScroll = mRadarList->getScrollPos();
-	if (lastRadarSelectedItem)
+	std::vector<LLUUID> selected_ids;
+	for(size_t i=0;i<mRadarList->getAllSelected().size();i++)
 	{
-		selected_id = lastRadarSelectedItem->getColumn(mRadarList->getColumn("uuid")->mIndex)->getValue().asUUID();
+		selected_ids.push_back(mRadarList->getAllSelected().at(i)->getColumn(mRadarList->getColumn("uuid")->mIndex)->getValue().asUUID());
 	}
+	S32 lastScroll = mRadarList->getScrollPos();
 	mRadarList->clearRows();
 	mRadarEnterAlerts.clear();
 	mRadarLeaveAlerts.clear();
@@ -1235,17 +1234,25 @@ void LLPanelPeople::updateNearbyList()
 		}
 
 		//AO: Preserve selection
-		if (lastRadarSelectedItem)
+		/*if (lastRadarSelectedItem)
 		{
 			if (avId == selected_id)
 			{
 				mRadarList->selectByID(avId);
 				updateButtons(); // TODO: only update on change, instead of every tick
 			}
-		}
+		}*/
 	} // End STEP 2, all model/presentation row processing complete.
 	//Reset scroll position
 	mRadarList->setScrollPos(lastScroll);
+
+	//Reset selection list
+	//AO: Preserve selection
+	if(!selected_ids.empty())
+	{
+		mRadarList->selectMultiple(selected_ids);
+	}
+	updateButtons();
 	
 	//
 	//STEP 3 , process any bulk actions that require the whole model to be known first
@@ -1480,7 +1487,7 @@ void LLPanelPeople::updateButtons()
 	buttonSetVisible("im_btn",				!group_tab_active);
 	buttonSetVisible("call_btn",			!group_tab_active);
 	buttonSetVisible("group_call_btn",		group_tab_active);
-	buttonSetVisible("teleport_btn",		friends_tab_active);
+	buttonSetVisible("teleport_btn",		nearby_tab_active || friends_tab_active);
 	buttonSetVisible("share_btn",			nearby_tab_active || friends_tab_active);
 		
 	if (group_tab_active)
@@ -1612,9 +1619,10 @@ void LLPanelPeople::getCurrentItemIDs(uuid_vec_t& selected_uuids) const
 	{
 		// AO, adapted for scrolllist. No multiselect yet
 		//mNearbyList->getSelectedUUIDs(selected_uuids);
-		LLScrollListItem* item = mRadarList->getFirstSelected();
-		if (item)
-			selected_uuids.push_back(item->getColumn(mRadarList->getColumn("name")->mIndex)->getValue().asUUID());
+		for(size_t i=0;i<mRadarList->getAllSelected().size();i++)
+		{
+			selected_uuids.push_back(mRadarList->getAllSelected().at(i)->getColumn(mRadarList->getColumn("uuid")->mIndex)->getValue().asUUID());
+		}
 	}
 	else if (cur_tab == RECENT_TAB_NAME)
 		mRecentList->getSelectedUUIDs(selected_uuids);
diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index 5046e4325b..fc93994702 100644
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -155,7 +155,7 @@ Looking for people to hang out with? Use the search box to find topics or conten
 		     sort_ascending="true"
 		     name="radar_list"
 		     draw_stripes="true"
-		     multi_select="false"
+		     multi_select="true"
 		     width="311">
 		        <radar_list.columns
 		         label="NAME"