diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-02 18:19:36 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-02 18:19:36 +0000 |
| commit | 7ba025b6256c75dc1e8f6a19002e590421dfffcd (patch) | |
| tree | 186942478318b1ddd42d163577e55f0e9ba96f00 /indra/llui | |
| parent | cb57f65f689fe98e0f7b2d9fdb4cd753c927a44c (diff) | |
| parent | 1da3feec8b99d938aa5df6f89e785fb317c88c45 (diff) | |
merge.
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/llfloater.cpp | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp index 3b3e644d10..a55915af35 100644 --- a/indra/llui/llfloater.cpp +++ b/indra/llui/llfloater.cpp @@ -1650,24 +1650,8 @@ void LLFloater::draw() } else { - //FIXME: get rid of this hack - // draw children - LLView* focused_child = dynamic_cast<LLView*>(gFocusMgr.getKeyboardFocus()); - BOOL focused_child_visible = FALSE; - if (focused_child && focused_child->getParent() == this) - { - focused_child_visible = focused_child->getVisible(); - focused_child->setVisible(FALSE); - } - // don't call LLPanel::draw() since we've implemented custom background rendering LLView::draw(); - - if (focused_child_visible) - { - focused_child->setVisible(TRUE); - } - drawChild(focused_child); } // update tearoff button for torn off floaters |