summaryrefslogtreecommitdiff
path: root/indra/llui/lltoggleablemenu.cpp
diff options
context:
space:
mode:
authorGilbert Gonzales <gilbert@lindenlab.com>2012-10-17 15:28:40 -0700
committerGilbert Gonzales <gilbert@lindenlab.com>2012-10-17 15:28:40 -0700
commit3dc61c4b4afed47826070aa906e58c8c5ca3efa0 (patch)
tree078d2f9d44e5d6f0fc0f47cee388377eb8c0e0ed /indra/llui/lltoggleablemenu.cpp
parent05a72687d848c13754039f6e720a137827533fdb (diff)
parentc320b4878ae9cd166594285a88437f0d5c333353 (diff)
merging in latest changes
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 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);
+}