summaryrefslogtreecommitdiff
path: root/indra/llui/lltoggleablemenu.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2013-03-13 15:15:15 -0400
committerOz Linden <oz@lindenlab.com>2013-03-13 15:15:15 -0400
commit75722baf295aff7927bff3c70cdf0ec27399cb37 (patch)
treea7a3fccc7bfebb4605c561e34ac66ad3c478368e /indra/llui/lltoggleablemenu.cpp
parent5c68b2456e8603322a1f12694c196246752bab53 (diff)
parentd348deb7049cbaef7c228000525c7ee5a265464c (diff)
merge changes for latest viewer-development
Diffstat (limited to 'indra/llui/lltoggleablemenu.cpp')
-rw-r--r--indra/llui/lltoggleablemenu.cpp5
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);
+}