Group Bans!
Thankies Baker Linden~ Ported Ansariel's mAvatarNameCacheConnection change to mAvatarNameCacheConnections to llpanelgroupbulkimpl.h Adds setGroupID in places, in case we ever want to add that.. but for now we don't really need/use it Adds Refresh_Off icon from upstream. Viewer Interesting changes: Moves LLGroupChange out of stdenums.h into llgroupmgr.h Moves roles_constants.h from llcommon into newview This looks like it's better without space changes...
This commit is contained in:
@@ -53,7 +53,8 @@ LLNameListCtrl::LLNameListCtrl(const std::string& name, const LLRect& rect, BOOL
|
||||
: LLScrollListCtrl(name, rect, NULL, allow_multiple_selection, draw_border,draw_heading),
|
||||
mNameColumnIndex(name_column_index),
|
||||
mAllowCallingCardDrop(false),
|
||||
mNameSystem(name_system)
|
||||
mNameSystem(name_system),
|
||||
mPendingLookupsRemaining(0)
|
||||
{
|
||||
setToolTip(tooltip);
|
||||
}
|
||||
@@ -203,6 +204,17 @@ LLScrollListItem* LLNameListCtrl::addNameItemRow(
|
||||
mAvatarNameCacheConnections.erase(it);
|
||||
}
|
||||
mAvatarNameCacheConnections[id] = LLAvatarNameCache::get(id,boost::bind(&LLNameListCtrl::onAvatarNameCache,this, _1, _2, suffix, item->getHandle()));
|
||||
|
||||
if (mPendingLookupsRemaining <= 0)
|
||||
{
|
||||
// BAKER TODO:
|
||||
// We might get into a state where mPendingLookupsRemainig might
|
||||
// go negative. So just reset it right now and figure out if it's
|
||||
// possible later :)
|
||||
mPendingLookupsRemaining = 0;
|
||||
mNameListCompleteSignal(false);
|
||||
}
|
||||
mPendingLookupsRemaining++;
|
||||
}
|
||||
break;
|
||||
}
|
||||
@@ -254,6 +266,8 @@ void LLNameListCtrl::removeNameItem(const LLUUID& agent_id)
|
||||
{
|
||||
selectNthItem(idx); // not sure whether this is needed, taken from previous implementation
|
||||
deleteSingleItem(idx);
|
||||
|
||||
mPendingLookupsRemaining--;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -292,6 +306,23 @@ void LLNameListCtrl::onAvatarNameCache(const LLUUID& agent_id,
|
||||
}
|
||||
}
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////
|
||||
// BAKER - FIX NameListCtrl
|
||||
//if (mPendingLookupsRemaining <= 0)
|
||||
{
|
||||
// We might get into a state where mPendingLookupsRemaining might
|
||||
// go negative. So just reset it right now and figure out if it's
|
||||
// possible later :)
|
||||
//mPendingLookupsRemaining = 0;
|
||||
|
||||
mNameListCompleteSignal(true);
|
||||
}
|
||||
//else
|
||||
{
|
||||
// mPendingLookupsRemaining--;
|
||||
}
|
||||
//////////////////////////////////////////////////////////////////////////
|
||||
|
||||
dirtyColumns();
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user