From 3b5b6e35c4f1d5412349766deff7bf573ac1a301 Mon Sep 17 00:00:00 2001
From: maksymsproductengine <maksymsproductengine@lindenlab.com>
Date: Sat, 12 Jul 2014 02:51:27 +0300
Subject: [PATCH] fixing merge conficts
---
indra/newview/llnamelistctrl.cpp | 5 +++--
indra/newview/llnamelistctrl.h | 1 +
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/indra/newview/llnamelistctrl.cpp b/indra/newview/llnamelistctrl.cpp
index c0bf7634375..54e4c6c1dac 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 ae74ca2cbc4..2c40eeaacac 100755
--- a/indra/newview/llnamelistctrl.h
+++ b/indra/newview/llnamelistctrl.h
@@ -168,6 +168,7 @@ class LLNameListCtrl
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;
--
GitLab