summaryrefslogtreecommitdiff
path: root/indra/llui/lltoggleablemenu.cpp
diff options
context:
space:
mode:
authorGilbert Gonzales <gilbert@lindenlab.com>2012-10-17 15:27:39 -0700
committerGilbert Gonzales <gilbert@lindenlab.com>2012-10-17 15:27:39 -0700
commitc320b4878ae9cd166594285a88437f0d5c333353 (patch)
treed4b8f11a01bfbeb30cd8e8de96e8c12a1364ff47 /indra/llui/lltoggleablemenu.cpp
parent3ee73ee98d31e572e284371074b7cd4744005a29 (diff)
parent33bd704c58fa707d0a4cc89216538c9d64d6e109 (diff)
merging in latest code
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);
+}