diff options
author | Oz Linden <oz@lindenlab.com> | 2013-02-12 13:27:03 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2013-02-12 13:27:03 -0500 |
commit | 8bb3d0891dfd87b54cd45dfe199c2f1bf21205b3 (patch) | |
tree | 30f038fde12f74908f94be9079cdee759481c5a0 /indra/llui/lltoggleablemenu.cpp | |
parent | 66c75202a8a99adeb7de443ce5ebe3d834f91c24 (diff) | |
parent | e87000ba0750e55d9d6b55feccc4124f5d2b4b74 (diff) |
merge up to 3.4.5-release
Diffstat (limited to 'indra/llui/lltoggleablemenu.cpp')
-rw-r--r-- | indra/llui/lltoggleablemenu.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/llui/lltoggleablemenu.cpp b/indra/llui/lltoggleablemenu.cpp index e4d1a37569..00d52fe10d 100644 --- a/indra/llui/lltoggleablemenu.cpp +++ b/indra/llui/lltoggleablemenu.cpp @@ -101,3 +101,8 @@ bool LLToggleableMenu::toggleVisibility() return true; } + +bool LLToggleableMenu::addChild(LLView* view, S32 tab_group) +{ + return addContextChild(view, tab_group); +} |