Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add in menus for groups, and rework LFIDBearer to handle its menus

Browse Source 
Also allow List.StartIM for multiselect
Add IsInGroup, NotInGroup, Leave, Join, and Activate "List." menu options
This commit is contained in:
Liru Færs
2019-11-24 00:27:19 -05:00
parent f5c19b9e5c
commit 1b913443ad
9 changed files with 161 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
indra/newview/llnameeditor.cpp
View File

@@ -76,15 +76,14 @@ BOOL LLNameEditor::handleRightMouseDown(S32 x, S32 y, MASK mask)
{
bool simple_menu = mContextMenuHandle.get()->getName() == "rclickmenu";
std::string new_menu;
// Singu TODO: Generic menus for groups
bool needs_simple = mIsGroup || !mAllowInteract || mNameID.isNull(); // Need simple if no ID or blocking interaction
bool needs_simple = !mAllowInteract || mNameID.isNull(); // Need simple if no ID or blocking interaction
if (!simple_menu && needs_simple) // Switch to simple menu
{
new_menu = "menu_texteditor.xml";
}
else if (!needs_simple && simple_menu)
else // TODO: This is lazy, but I cannot recall a name editor that switches between group and avatar, so logic is not needed yet.
{
new_menu = "menu_nameeditor_avatar.xml";
new_menu = mIsGroup ? "menu_nameeditor_group.xml" : "menu_nameeditor_avatar.xml";
}
if (!new_menu.empty()) setContextMenu(LLUICtrlFactory::instance().buildMenu(new_menu, LLMenuGL::sMenuContainer));
sActive = this;