fixing merge conficts

2 files changed, 4 insertions, 2 deletions

diff --git a/indra/newview/llnamelistctrl.cpp b/indra/newview/llnamelistctrl.cpp
index c0bf763437..54e4c6c1da 100755
--- a/indra/newview/llnamelistctrl.cpp
+++ b/indra/newview/llnamelistctrl.cpp
@@ -64,8 +64,7 @@ LLNameListCtrl::LLNameListCtrl(const LLNameListCtrl::Params& p)
 	mNameColumnIndex(p.name_column.column_index),
 	mNameColumn(p.name_column.column_name),
 	mAllowCallingCardDrop(p.allow_calling_card_drop),
-	mShortNames(p.short_names)
-	mAvatarNameCacheConnection(),
+	mShortNames(p.short_names),
 	mPendingLookupsRemaining(0)
 {}
 
@@ -337,6 +336,8 @@ LLScrollListItem* LLNameListCtrl::addNameItemRow(
 						it->second.disconnect();
 					}
 					mAvatarNameCacheConnections.erase(it);
+				}
+				mAvatarNameCacheConnections[id] = LLAvatarNameCache::get(id,boost::bind(&LLNameListCtrl::onAvatarNameCache,this, _1, _2, suffix, item->getHandle()));
 
 				if(mPendingLookupsRemaining <= 0)
 				{
diff --git a/indra/newview/llnamelistctrl.h b/indra/newview/llnamelistctrl.h
index ae74ca2cbc..2c40eeaaca 100755
--- a/indra/newview/llnamelistctrl.h
+++ b/indra/newview/llnamelistctrl.h
@@ -168,6 +168,7 @@ private:
 	BOOL			mAllowCallingCardDrop;
 	bool			mShortNames;  // display name only, no SLID
 	typedef std::map<LLUUID, boost::signals2::connection> avatar_name_cache_connection_map_t;
+	avatar_name_cache_connection_map_t mAvatarNameCacheConnections;
 
 	S32 mPendingLookupsRemaining;
 	namelist_complete_signal_t mNameListCompleteSignal;