From 5f6dcfa82a4791bb77c342b92f46f6b558da7d10 Mon Sep 17 00:00:00 2001 From: Inusaito Sayori Date: Thu, 29 May 2014 20:12:31 -0400 Subject: [PATCH] [UI Overhaul] Restore LLContextMenu::appendContextSubMenu definition, lost in last commit. (Thannks for catching this, Tazy!) --- indra/llui/llmenugl.cpp | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/indra/llui/llmenugl.cpp b/indra/llui/llmenugl.cpp index 5f59927fc..039c7a789 100644 --- a/indra/llui/llmenugl.cpp +++ b/indra/llui/llmenugl.cpp @@ -4983,6 +4983,17 @@ bool LLContextMenu::addChild(LLView* view, S32 tab_group) } +BOOL LLContextMenu::appendContextSubMenu(LLContextMenu* menu) +{ + if (menu == this) + { + llerrs << "Can't attach a context menu to itself" << llendl; + } + LLContextMenuBranch* item = new LLContextMenuBranch(menu->getName(), menu->getLabel(), menu); + getParent()->addChild(item->getBranch()); + return append(item); +} + const S32 PIE_MENU_HEIGHT = 190; const S32 PIE_MENU_WIDTH = 190;