diff options
author | Oz Linden <oz@lindenlab.com> | 2013-02-14 09:05:55 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2013-02-14 09:05:55 -0500 |
commit | c880c961bb2a0838bc529efc07cfeb12f5636d88 (patch) | |
tree | beff6cda58f68c5d95277cf77957dc96c2a79dfd /indra/llui/lltoggleablemenu.cpp | |
parent | 841dc5da2ef9626fa4ab9255681d217df62a6b0b (diff) | |
parent | e87000ba0750e55d9d6b55feccc4124f5d2b4b74 (diff) |
merge changes for 3.4.5
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); +} |