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

Woops, don't be so tired or you'll miss silly things...

Browse Source 
or be super tired and see everything.

This fixes right click name editor logic causing constant menu swaps
every right click, but hey, at least we know that works, right?
This commit is contained in:
Liru Færs
2019-10-11 04:55:10 -04:00
parent 8d5f1191dd
commit 975f3b420e
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
indra/newview/llnameeditor.cpp
View File

@@ -73,11 +73,12 @@ 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
if (!simple_menu && (mIsGroup || !mAllowInteract || mNameID.isNull())) // If no ID or blocking interaction switch to simple menu
bool needs_simple = mIsGroup || !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 (simple_menu && !mIsGroup)
else if (!needs_simple && simple_menu)
{
new_menu = "menu_nameeditor_avatar.xml";
}