Skip to content
Snippets Groups Projects
Commit 7d308294 authored by Vadim Savchuk's avatar Vadim Savchuk
Browse files

Removed unused code (context menu handling in LLAvatarListItem).

--HG--
branch : product-engine
parent 7bfb8ec0
No related branches found
No related tags found
No related merge requests found
...@@ -322,7 +322,6 @@ void LLAvatarList::addNewItem(const LLUUID& id, const std::string& name, BOOL is ...@@ -322,7 +322,6 @@ void LLAvatarList::addNewItem(const LLUUID& id, const std::string& name, BOOL is
item->setAvatarId(id, mIgnoreOnlineStatus); item->setAvatarId(id, mIgnoreOnlineStatus);
item->setOnline(mIgnoreOnlineStatus ? true : is_online); item->setOnline(mIgnoreOnlineStatus ? true : is_online);
item->showLastInteractionTime(mShowLastInteractionTime); item->showLastInteractionTime(mShowLastInteractionTime);
item->setContextMenu(mContextMenu);
item->childSetVisible("info_btn", false); item->childSetVisible("info_btn", false);
item->setAvatarIconVisible(mShowIcons); item->setAvatarIconVisible(mShowIcons);
......
...@@ -57,7 +57,6 @@ LLAvatarListItem::LLAvatarListItem(bool not_from_ui_factory/* = true*/) ...@@ -57,7 +57,6 @@ LLAvatarListItem::LLAvatarListItem(bool not_from_ui_factory/* = true*/)
mSpeakingIndicator(NULL), mSpeakingIndicator(NULL),
mInfoBtn(NULL), mInfoBtn(NULL),
mProfileBtn(NULL), mProfileBtn(NULL),
mContextMenu(NULL),
mOnlineStatus(E_UNKNOWN), mOnlineStatus(E_UNKNOWN),
mShowInfoBtn(true), mShowInfoBtn(true),
mShowProfileBtn(true) mShowProfileBtn(true)
......
...@@ -92,8 +92,6 @@ class LLAvatarListItem : public LLPanel, public LLFriendObserver ...@@ -92,8 +92,6 @@ class LLAvatarListItem : public LLPanel, public LLFriendObserver
void showInfoBtn(bool show_info_btn) {mInfoBtn->setVisible(show_info_btn); } void showInfoBtn(bool show_info_btn) {mInfoBtn->setVisible(show_info_btn); }
void showLastInteractionTime(bool show); 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) * 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 * But this is a *HACK. The real reason of it was in incorrect logic while hiding profile/info/speaker buttons
...@@ -127,7 +125,6 @@ class LLAvatarListItem : public LLPanel, public LLFriendObserver ...@@ -127,7 +125,6 @@ class LLAvatarListItem : public LLPanel, public LLFriendObserver
LLButton* mInfoBtn; LLButton* mInfoBtn;
LLButton* mProfileBtn; LLButton* mProfileBtn;
ContextMenu* mContextMenu;
LLUUID mAvatarId; LLUUID mAvatarId;
std::string mHighlihtSubstring; // substring to highlight std::string mHighlihtSubstring; // substring to highlight
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment