From 99300085d4d1e71035be22ab4f671624a4bd28c2 Mon Sep 17 00:00:00 2001 From: MaksymS ProductEngine Date: Fri, 24 Aug 2012 00:22:40 +0300 Subject: MAINT-1415 FIXED Empty non-functional 'Take off' menu is presented in inspector: - class LLToggleableMenu had been updated with two methods like: appendContextSubMenu and addChild, which based on similar in LLContextMenu --- indra/llui/lltoggleablemenu.cpp | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'indra/llui/lltoggleablemenu.cpp') diff --git a/indra/llui/lltoggleablemenu.cpp b/indra/llui/lltoggleablemenu.cpp index d29260750f..b4c6c6162b 100644 --- a/indra/llui/lltoggleablemenu.cpp +++ b/indra/llui/lltoggleablemenu.cpp @@ -99,3 +99,8 @@ bool LLToggleableMenu::toggleVisibility() return true; } + +bool LLToggleableMenu::addChild(LLView* view, S32 tab_group) +{ + return addContextChild(view, tab_group); +} -- cgit v1.2.3 From bf6182daa8b4d7cea79310547f71d7a3155e17b0 Mon Sep 17 00:00:00 2001 From: Graham Madarasz Date: Fri, 29 Mar 2013 07:50:08 -0700 Subject: Update Mac and Windows breakpad builds to latest --- indra/llui/lltoggleablemenu.cpp | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 indra/llui/lltoggleablemenu.cpp (limited to 'indra/llui/lltoggleablemenu.cpp') diff --git a/indra/llui/lltoggleablemenu.cpp b/indra/llui/lltoggleablemenu.cpp old mode 100644 new mode 100755 -- cgit v1.2.3