summaryrefslogtreecommitdiff
path: root/indra/llui/lltoggleablemenu.cpp
diff options
context:
space:
mode:
authorMonty Brandenberg <monty@lindenlab.com>2013-01-09 16:39:30 -0500
committerMonty Brandenberg <monty@lindenlab.com>2013-01-09 16:39:30 -0500
commitcc0a4bf6acafe759baaccea65022c963373ea012 (patch)
treed4fe1f1e34b1ab0d140a37c1f80d09034824d3e8 /indra/llui/lltoggleablemenu.cpp
parent11e506f2eb979a5ddfc3ca6f9c626771ab012a78 (diff)
parentcdd45b9abb35b40f2a31e7433fb99e588df8b40b (diff)
Merge. Pull viewer-development in prior to filing DRTVWR merge request.
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);
+}