livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

EXT-8198 Incorrect right-click options for library folders 

Only adding "--no options--" when right-click context menu is empty.  Normal priority bug but rather annoying visually.
meow-7.2.2
Loren Shih 2010-07-02 14:56:12 -04:00
parent 695671d51e
commit cd4c44fe7a
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
indra/newview/llinventorybridge.cpp
View File

@ -2617,11 +2617,6 @@ void LLFolderBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
gInventory.addObserver(fetch);
}
}
else
{
mItems.push_back(std::string("--no options--"));
mDisabledItems.push_back(std::string("--no options--"));
}
// Preemptively disable system folder removal if more than one item selected.
if ((flags & FIRST_SELECTED_ITEM) == 0)
@ -2635,6 +2630,12 @@ void LLFolderBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
mDisabledItems.push_back(std::string("Share"));
}
if (mItems.empty())
{
mItems.push_back(std::string("--no options--"));
mDisabledItems.push_back(std::string("--no options--"));
}
hide_context_entries(menu, mItems, mDisabledItems);
}