diff options
| author | Don Kjer <don@lindenlab.com> | 2007-05-02 21:24:47 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2007-05-02 21:24:47 +0000 |
| commit | 1c909afe3998778e4cc045c9ab733e8afbf7c25b (patch) | |
| tree | 75c00a32a8e305280cbec253195d1113d628fc3e /indra/llui/llmenugl.cpp | |
| parent | bc59c04653bf1404e8148a8169208b146a123b28 (diff) | |
svn merge -r 60342:61148 svn+ssh://svn/svn/linden/branches/maintenance into release
Diffstat (limited to 'indra/llui/llmenugl.cpp')
| -rw-r--r-- | indra/llui/llmenugl.cpp | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/indra/llui/llmenugl.cpp b/indra/llui/llmenugl.cpp index 79c38a87c0..f5dcae5787 100644 --- a/indra/llui/llmenugl.cpp +++ b/indra/llui/llmenugl.cpp @@ -709,14 +709,18 @@ void LLMenuItemTearOffGL::doIt() LLFloater* parent_floater = LLFloater::getFloaterByHandle(mParentHandle); LLFloater* tear_off_menu = LLTearOffMenu::create(getMenu()); - if (parent_floater && tear_off_menu) + + if (tear_off_menu) { - parent_floater->addDependentFloater(tear_off_menu, FALSE); - } + if (parent_floater) + { + parent_floater->addDependentFloater(tear_off_menu, FALSE); + } - // give focus to torn off menu because it will have been taken away - // when parent menu closes - tear_off_menu->setFocus(TRUE); + // give focus to torn off menu because it will have + // been taken away when parent menu closes + tear_off_menu->setFocus(TRUE); + } } LLMenuItemGL::doIt(); } |