Removed unused code (context menu handling in LLAvatarListItem).
--HG-- branch : product-enginemeow-7.2.2
parent
7bfb8ec050
commit
7d308294e9
|
|
@ -322,7 +322,6 @@ void LLAvatarList::addNewItem(const LLUUID& id, const std::string& name, BOOL is
|
|||
item->setAvatarId(id, mIgnoreOnlineStatus);
|
||||
item->setOnline(mIgnoreOnlineStatus ? true : is_online);
|
||||
item->showLastInteractionTime(mShowLastInteractionTime);
|
||||
item->setContextMenu(mContextMenu);
|
||||
|
||||
item->childSetVisible("info_btn", false);
|
||||
item->setAvatarIconVisible(mShowIcons);
|
||||
|
|
|
|||
|
|
@ -57,7 +57,6 @@ LLAvatarListItem::LLAvatarListItem(bool not_from_ui_factory/* = true*/)
|
|||
mSpeakingIndicator(NULL),
|
||||
mInfoBtn(NULL),
|
||||
mProfileBtn(NULL),
|
||||
mContextMenu(NULL),
|
||||
mOnlineStatus(E_UNKNOWN),
|
||||
mShowInfoBtn(true),
|
||||
mShowProfileBtn(true)
|
||||
|
|
|
|||
|
|
@ -92,8 +92,6 @@ public:
|
|||
void showInfoBtn(bool show_info_btn) {mInfoBtn->setVisible(show_info_btn); }
|
||||
void showLastInteractionTime(bool show);
|
||||
|
||||
void setContextMenu(ContextMenu* menu) { mContextMenu = menu; }
|
||||
|
||||
/**
|
||||
* This method was added to fix EXT-2364 (Items in group/ad-hoc IM participant list (avatar names) should be reshaped when adding/removing the "(Moderator)" label)
|
||||
* But this is a *HACK. The real reason of it was in incorrect logic while hiding profile/info/speaker buttons
|
||||
|
|
@ -127,7 +125,6 @@ private:
|
|||
|
||||
LLButton* mInfoBtn;
|
||||
LLButton* mProfileBtn;
|
||||
ContextMenu* mContextMenu;
|
||||
|
||||
LLUUID mAvatarId;
|
||||
std::string mHighlihtSubstring; // substring to highlight
|
||||
|
|
|
|||
Loading…
Reference in New Issue