ACME-252 Create AvatarFolderItemView: Now the people view shows both the facebook name and the SL name (assuming this connection exists).

2 files changed, 7 insertions, 1 deletions

diff --git a/indra/newview/llpanelpeople.cpp b/indra/newview/llpanelpeople.cpp
index 4c044c2471..a9a024c9ed 100644
--- a/indra/newview/llpanelpeople.cpp
+++ b/indra/newview/llpanelpeople.cpp
@@ -1698,7 +1698,12 @@ void LLPanelPeople::addParticipantToModel(LLPersonTabModel * person_folder_model
 {
 	LLPersonModel* person_model = NULL;
 
-	person_model = new LLPersonModel(agent_id, name, mPersonFolderViewModel);
+	LLAvatarName avatar_name;
+	bool avatar_name_exists = LLAvatarNameCache::get(agent_id, &avatar_name);
+
+	std::string aggregated_name = avatar_name_exists ? name + " (" + avatar_name.getDisplayName() + ") " : name;
+
+	person_model = new LLPersonModel(agent_id, aggregated_name, mPersonFolderViewModel);
 	person_folder_model->addParticipant(person_model);
 }
 
diff --git a/indra/newview/llpersontabview.cpp b/indra/newview/llpersontabview.cpp
index a0d6b40d08..76f3151777 100644
--- a/indra/newview/llpersontabview.cpp
+++ b/indra/newview/llpersontabview.cpp
@@ -181,6 +181,7 @@ BOOL LLPersonView::postBuild()
 
 	LLPersonModel * person_model = static_cast<LLPersonModel *>(getViewModelItem());
 
+	mAvatarIcon->setValue(person_model->getAgentID());
 	mInfoBtn->setClickedCallback(boost::bind(&LLFloaterReg::showInstance, "inspect_avatar", LLSD().with("avatar_id", person_model->getAgentID()), FALSE));
 	mProfileBtn->setClickedCallback(boost::bind(&LLAvatarActions::showProfile, person_model->getAgentID()));