From 85e667bb3513215cfc8e109d2681433db5bba225 Mon Sep 17 00:00:00 2001
From: Lirusaito <inusaito@gmail.com>
Date: Thu, 18 Jul 2013 21:55:18 -0400
Subject: [PATCH] Don't use mAvatarNameCacheConnection, because it does indeed
 lead to partially populated namelists as predicted

---
 indra/newview/llnamelistctrl.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/indra/newview/llnamelistctrl.cpp b/indra/newview/llnamelistctrl.cpp
index 653b951d3..2cce1f2de 100644
--- a/indra/newview/llnamelistctrl.cpp
+++ b/indra/newview/llnamelistctrl.cpp
@@ -199,11 +199,12 @@ LLScrollListItem* LLNameListCtrl::addNameItemRow(
 			// ...schedule a callback
 				// This is not correct and will likely lead to partially populated lists in cases where avatar names are not cached.
 				// *TODO : Change this to have 2 callbacks : one callback per list item and one for the whole list.
+				/* Singu Note: Indeed it does, for now let's not use it
 				if (mAvatarNameCacheConnection.connected())
 				{
 					mAvatarNameCacheConnection.disconnect();
 				}
-				mAvatarNameCacheConnection = LLAvatarNameCache::get(id,boost::bind(&LLNameListCtrl::onAvatarNameCache,this, _1, _2, item->getHandle()));
+				mAvatarNameCacheConnection =*/ LLAvatarNameCache::get(id,boost::bind(&LLNameListCtrl::onAvatarNameCache,this, _1, _2, item->getHandle()));
 		}
 			break;
 		}
@@ -262,7 +263,7 @@ void LLNameListCtrl::onAvatarNameCache(const LLUUID& agent_id,
 									   const LLAvatarName& av_name,
 									   LLHandle<LLNameListItem> item)
 {
-	mAvatarNameCacheConnection.disconnect();
+	//mAvatarNameCacheConnection.disconnect();
 
 	std::string name;
 	if (mShortNames)