Skip to content
Snippets Groups Projects
Commit af61dd45 authored by Mike Antipov's avatar Mike Antipov
Browse files

Fixed major bug EXT-3960 (group none cannot be activated through context menu,...

Fixed major bug EXT-3960 (group none cannot be activated through context menu, but checkbox button works)
- updated condition to enable "Activate" menu item for any group
- also cleaned commented out code

--HG--
branch : product-engine
parent b150aaf1
No related branches found
No related tags found
No related merge requests found
......@@ -210,7 +210,6 @@ void LLGroupList::addNewItem(const LLUUID& id, const std::string& name, const LL
item->setGroupID(id);
item->setName(name, mNameFilter);
item->setGroupIconID(icon_id);
// item->setContextMenu(mContextMenu);
item->childSetVisible("info_btn", false);
item->childSetVisible("profile_btn", false);
......@@ -268,8 +267,9 @@ bool LLGroupList::onContextMenuItemEnable(const LLSD& userdata)
LLUUID selected_group_id = getSelectedUUID();
bool real_group_selected = selected_group_id.notNull(); // a "real" (not "none") group is selected
// each group including "none" can be activated
if (userdata.asString() == "activate")
return real_group_selected && gAgent.getGroupID() != selected_group_id;
return gAgent.getGroupID() != selected_group_id;
return real_group_selected;
}
......@@ -283,7 +283,6 @@ LLGroupListItem::LLGroupListItem()
mGroupIcon(NULL),
mGroupNameBox(NULL),
mInfoBtn(NULL),
//mContextMenu(NULL), //TODO:
mGroupID(LLUUID::null)
{
LLUICtrlFactory::getInstance()->buildPanel(this, "panel_group_list_item.xml");
......
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