summaryrefslogtreecommitdiff
path: root/indra/llui/llmenugl.cpp
diff options
context:
space:
mode:
authorMark Palange <palange@lindenlab.com>2008-11-07 17:51:03 +0000
committerMark Palange <palange@lindenlab.com>2008-11-07 17:51:03 +0000
commitf89f19990cbb9f3f2e7473ac6c159098bdfabec7 (patch)
treee7fa406e2db5e9adc2e24e00557d7b3d3f93203a /indra/llui/llmenugl.cpp
parentb2bfb128e7d30e1cdb293a2ac192a0cbe63fe528 (diff)
QAR-992 Merging revisions 101012-101170,101686-101687 of svn+ssh://svn.lindenlab.com/svn/linden/qa/viewer_combo_1-22-merge into linden/release
Diffstat (limited to 'indra/llui/llmenugl.cpp')
-rw-r--r--indra/llui/llmenugl.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/llui/llmenugl.cpp b/indra/llui/llmenugl.cpp
index 03edaf69d3..b4619d2738 100644
--- a/indra/llui/llmenugl.cpp
+++ b/indra/llui/llmenugl.cpp
@@ -1309,6 +1309,7 @@ void LLMenuItemBranchGL::openMenu()
}
mBranch->translate( delta_x, delta_y );
mBranch->setVisible( TRUE );
+ mBranch->getParent()->sendChildToFront(mBranch);
}
}
@@ -1427,6 +1428,7 @@ void LLMenuItemBranchDownGL::openMenu( void )
setHighlight(TRUE);
branch->setVisible( TRUE );
+ branch->getParent()->sendChildToFront(branch);
}
}
}
@@ -2958,6 +2960,7 @@ void LLMenuGL::showPopup(LLView* spawning_view, LLMenuGL* menu, S32 x, S32 y)
}
menu->translate( delta_x, delta_y );
menu->setVisible( TRUE );
+ menu->getParent()->sendChildToFront(menu);
}
//-----------------------------------------------------------------------------