From 86e91147d1e85dbc588c03df013c0918412abcd2 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Mon, 7 Dec 2015 19:50:46 +0100
Subject: [PATCH] Backed out changeset 010aa51cbba7 - will be replaced by LL
 version to prevent merge collisions in the future

---
 indra/newview/llnamelistctrl.cpp | 12 +-----------
 indra/newview/llnamelistctrl.h   |  5 +----
 2 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/indra/newview/llnamelistctrl.cpp b/indra/newview/llnamelistctrl.cpp
index 788202cc7c..b6ede8645b 100755
--- a/indra/newview/llnamelistctrl.cpp
+++ b/indra/newview/llnamelistctrl.cpp
@@ -355,9 +355,7 @@ LLScrollListItem* LLNameListCtrl::addNameItemRow(
 					}
 					mAvatarNameCacheConnections.erase(it);
 				}
-				// <FS:Ansariel> FIRE-17408: Prefix is not passed to name cache callback
-				//mAvatarNameCacheConnections[id] = LLAvatarNameCache::get(id,boost::bind(&LLNameListCtrl::onAvatarNameCache,this, _1, _2, suffix, item->getHandle()));
-				mAvatarNameCacheConnections[id] = LLAvatarNameCache::get(id,boost::bind(&LLNameListCtrl::onAvatarNameCache,this, _1, _2, prefix, suffix, item->getHandle()));
+				mAvatarNameCacheConnections[id] = LLAvatarNameCache::get(id,boost::bind(&LLNameListCtrl::onAvatarNameCache,this, _1, _2, suffix, item->getHandle()));
 
 				// <FS:Ansariel> Fix Baker's NameListCtrl un-fix
 				//if(mPendingLookupsRemaining <= 0)
@@ -432,7 +430,6 @@ void LLNameListCtrl::removeNameItem(const LLUUID& agent_id)
 
 void LLNameListCtrl::onAvatarNameCache(const LLUUID& agent_id,
 									   const LLAvatarName& av_name,
-									   std::string prefix, // <FS:Ansariel> FIRE-17408: Prefix is not passed to name cache callback
 									   std::string suffix,
 									   LLHandle<LLNameListItem> item)
 {
@@ -458,13 +455,6 @@ void LLNameListCtrl::onAvatarNameCache(const LLUUID& agent_id,
 		name.append(suffix);
 	}
 
-	// <FS:Ansariel> FIRE-17408: Prefix is not passed to name cache callback
-	if (!prefix.empty())
-	{
-		name = prefix + name;
-	}
-	// </FS:Ansariel>
-
 	LLNameListItem* list_item = item.get();
 	if (list_item && list_item->getUUID() == agent_id)
 	{
diff --git a/indra/newview/llnamelistctrl.h b/indra/newview/llnamelistctrl.h
index 09e2438a8b..419af96ee4 100755
--- a/indra/newview/llnamelistctrl.h
+++ b/indra/newview/llnamelistctrl.h
@@ -182,10 +182,7 @@ public:
 	/*virtual*/ void mouseOverHighlightNthItem( S32 index );
 private:
 	void showInspector(const LLUUID& avatar_id, bool is_group, bool is_experience = false);
-	// <FS:Ansariel> FIRE-17408: Prefix is not passed to name cache callback
-	//void onAvatarNameCache(const LLUUID& agent_id, const LLAvatarName& av_name, std::string suffix, LLHandle<LLNameListItem> item);
-	void onAvatarNameCache(const LLUUID& agent_id, const LLAvatarName& av_name, std::string prefix, std::string suffix, LLHandle<LLNameListItem> item);
-	// </FS:Ansariel>
+	void onAvatarNameCache(const LLUUID& agent_id, const LLAvatarName& av_name, std::string suffix, LLHandle<LLNameListItem> item);
 
 private:
 	S32    			mNameColumnIndex;