summaryrefslogtreecommitdiff
path: root/indra/llui
diff options
context:
space:
mode:
authorRichard Linden <none@none>2011-10-11 22:49:47 -0700
committerRichard Linden <none@none>2011-10-11 22:49:47 -0700
commitbb93dc154afe5fbed4dfa187ed6297d5714bdb5f (patch)
treefeabec8ea1beef33da013ee01c9b73966b7b0771 /indra/llui
parentf9e900f5ac9002f5ef3b44b02ac300971288e89b (diff)
parentd0cda13235079c6626ebc7bbe4de542784d50fa0 (diff)
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience-fui
Diffstat (limited to 'indra/llui')
-rw-r--r--indra/llui/llmenugl.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/llmenugl.cpp b/indra/llui/llmenugl.cpp
index badba7a416..3ef8d8ff35 100644
--- a/indra/llui/llmenugl.cpp
+++ b/indra/llui/llmenugl.cpp
@@ -1731,7 +1731,7 @@ void LLMenuGL::setCanTearOff(BOOL tear_off)
{
LLMenuItemTearOffGL::Params p;
mTearOffItem = LLUICtrlFactory::create<LLMenuItemTearOffGL>(p);
- addChildInBack(mTearOffItem);
+ addChild(mTearOffItem);
}
else if (!tear_off && mTearOffItem != NULL)
{