diff options
author | Steven Bennetts <steve@lindenlab.com> | 2008-05-06 18:09:03 +0000 |
---|---|---|
committer | Steven Bennetts <steve@lindenlab.com> | 2008-05-06 18:09:03 +0000 |
commit | 068da0b5655fc3c735cd8019ab3b6bb0defec4c0 (patch) | |
tree | 143580a4ff29c4c4df91c41e1429add4abaa3f87 /indra/llui | |
parent | eb14fece837683ebc58540d7f10eb74f5a5fbd4e (diff) |
merge release-QAR-511 Viewer 1.20 RC 5
merge Branch_1-20-Viewer -r 85828 : 86279 -> release
Diffstat (limited to 'indra/llui')
-rw-r--r-- | indra/llui/llfloater.cpp | 2 | ||||
-rw-r--r-- | indra/llui/lltabcontainer.cpp | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp index f80028656e..b595845546 100644 --- a/indra/llui/llfloater.cpp +++ b/indra/llui/llfloater.cpp @@ -2571,6 +2571,8 @@ void LLMultiFloater::addFloater(LLFloater* floaterp, BOOL select_added_floater, floaterp->setCanResize(FALSE); floaterp->setCanDrag(FALSE); floaterp->storeRectControl(); + // avoid double rendering of floater background (makes it more opaque) + floaterp->setBackgroundVisible(FALSE); if (mAutoResize) { diff --git a/indra/llui/lltabcontainer.cpp b/indra/llui/lltabcontainer.cpp index a1844d34f9..2d1228b084 100644 --- a/indra/llui/lltabcontainer.cpp +++ b/indra/llui/lltabcontainer.cpp @@ -716,7 +716,6 @@ void LLTabContainer::addTabPanel(LLPanel* child, child->setFollowsAll(); child->translate( tab_panel_rect.mLeft - child->getRect().mLeft, tab_panel_rect.mBottom - child->getRect().mBottom); child->reshape( tab_panel_rect.getWidth(), tab_panel_rect.getHeight(), TRUE ); - child->setBackgroundVisible( FALSE ); // No need to overdraw // add this child later child->setVisible( FALSE ); // Will be made visible when selected @@ -1795,3 +1794,4 @@ void LLTabContainer::commitHoveredButton(S32 x, S32 y) } } + |